wok-next rev 20776
gucharmap3: up (10.0.4)
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Wed Jun 06 20:53:55 2018 +0300 (2018-06-06) |
parents | 6e3a3eda6766 |
children | fb26e10987dc |
files | gucharmap3/receipt gucharmap3/stuff/patches/gucharmap3.patch |
line diff
1.1 --- a/gucharmap3/receipt Wed Jun 06 20:44:57 2018 +0300 1.2 +++ b/gucharmap3/receipt Wed Jun 06 20:53:55 2018 +0300 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="gucharmap3" 1.7 -VERSION="10.0.0" 1.8 +VERSION="10.0.4" 1.9 CATEGORY="utilities" 1.10 SHORT_DESC="GNOME Character Map for GTK+3" 1.11 MAINTAINER="al.bobylev@gmail.com" 1.12 @@ -21,7 +21,8 @@ 1.13 ./autogen.sh \ 1.14 --enable-vala \ 1.15 --with-unicode-data=download \ 1.16 - --program-suffix=3 && 1.17 + --program-suffix=3 \ 1.18 + PROG_UNZIP=/bin/unzip && 1.19 fix libtool && 1.20 make && 1.21 make install || return 1 1.22 @@ -41,21 +42,11 @@ 1.23 ;; 1.24 gucharmap3) 1.25 copy @std @rm 1.26 - DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk+3 \ 1.27 - libffi libharfbuzz liblzma libpng16 libxml2 pango pcre \ 1.28 - util-linux-blkid util-linux-mount util-linux-uuid xorg-libX11 \ 1.29 - xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libxcb \ 1.30 - xorg-pixman zlib" 1.31 + DEPENDS="atk cairo glib gtk+3 pango" 1.32 ;; 1.33 *-dev) 1.34 copy @dev 1.35 - DEPENDS="${SPLIT/$PACKAGE/} atk-dev bzip2-dev cairo-dev \ 1.36 - fontconfig-dev freetype-dev gdk-pixbuf-dev glib-dev gtk+3-dev \ 1.37 - harfbuzz-dev libffi-dev libpng16-dev libxml2-dev pango-dev \ 1.38 - pcre-dev util-linux-blkid-dev util-linux-mount-dev \ 1.39 - util-linux-uuid-dev xorg-libX11-dev xorg-libXau-dev \ 1.40 - xorg-libXdmcp-dev xorg-libXext-dev xorg-libXrender-dev \ 1.41 - xorg-libxcb-dev xorg-pixman-dev xz-dev zlib-dev" 1.42 + DEPENDS="${SPLIT/$PACKAGE/} glib-dev gtk+3-dev" 1.43 ;; 1.44 esac 1.45 }
2.1 --- a/gucharmap3/stuff/patches/gucharmap3.patch Wed Jun 06 20:44:57 2018 +0300 2.2 +++ b/gucharmap3/stuff/patches/gucharmap3.patch Wed Jun 06 20:53:55 2018 +0300 2.3 @@ -2,6 +2,8 @@ 2.4 gucharmap (for GTK+2) and gucharmap3 (for GTK+3) 2.5 Author: Aleksej Bobylev <al.bobylev@gmail.com> 2.6 2.7 +Plus: https://gitlab.gnome.org/GNOME/gucharmap/commit/4ad97abc893ded93296f7c157631369fbddcf90a 2.8 + 2.9 --- a/configure.ac 2.10 +++ b/configure.ac 2.11 @@ -36,7 +36,7 @@ 2.12 @@ -21,8 +23,22 @@ 2.13 +#GNOME_DEBUG_CHECK 2.14 2.15 AC_PROG_CC 2.16 - AC_DISABLE_STATIC 2.17 -@@ -222,7 +222,7 @@ 2.18 + AC_USE_SYSTEM_EXTENSIONS 2.19 +@@ -120,6 +120,13 @@ 2.20 + freetype2 2.21 + ]) 2.22 + 2.23 ++sv_LIBS="$LIBS" 2.24 ++LIBS= 2.25 ++AC_SEARCH_LIBS([dlsym],[dl]) 2.26 ++LIBDL="$LIBS" 2.27 ++LIBS="$sv_LIBS" 2.28 ++AC_SUBST([LIBDL]) 2.29 ++ 2.30 + GLIB_GENMARSHAL="$($PKG_CONFIG --variable=glib_genmarshal glib-2.0)" 2.31 + AC_SUBST([GLIB_GENMARSHAL]) 2.32 + GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)" 2.33 +@@ -225,7 +232,7 @@ 2.34 # i18n 2.35 # **** 2.36 2.37 @@ -31,7 +47,7 @@ 2.38 AC_SUBST([GETTEXT_PACKAGE]) 2.39 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[The gucharmap gettext domain]) 2.40 AM_GLIB_GNU_GETTEXT 2.41 -@@ -319,7 +319,7 @@ 2.42 +@@ -322,7 +329,7 @@ 2.43 2.44 AC_CONFIG_FILES([ 2.45 Makefile 2.46 @@ -62,3 +78,13 @@ 2.47 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) 2.48 2.49 pkgconfigdir = $(libdir)/pkgconfig 2.50 +--- a/gucharmap/Makefile.am 2.51 ++++ b/gucharmap/Makefile.am 2.52 +@@ -156,6 +156,7 @@ 2.53 + gucharmap_LDADD = \ 2.54 + libgucharmap@GUCHARMAP_LIBRARY_SUFFIX_U@.la \ 2.55 + $(GTK_LIBS) \ 2.56 ++ $(LIBDL) \ 2.57 + $(INTL_LIBS) 2.58 + 2.59 + dist_noinst_DATA = gucharmap-menus.ui