# HG changeset patch # User Aleksej Bobylev # Date 1547417489 -7200 # Node ID f3cf43fa2e550702ddb4f262384be70cecbed100 # Parent 4035a0b6ff202293dbe05e0a445471f2a21aa3a3 Update libxfce4util, xfconf, libxfce4ui diff -r 4035a0b6ff20 -r f3cf43fa2e55 libxfce4ui/receipt --- a/libxfce4ui/receipt Sat Jan 12 17:51:19 2019 +0200 +++ b/libxfce4ui/receipt Mon Jan 14 00:11:29 2019 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="libxfce4ui" -VERSION="4.12.0" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/ +VERSION="4.13.4" CATEGORY="x-window" SHORT_DESC="Xfce GTK widget library" MAINTAINER="devel@slitaz.org" @@ -10,12 +10,23 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL" +TARBALL_SHA1="480de7fa8e9cb14902ebb6af13054bfdd5bae947" -BUILD_DEPENDS="intltool libx11-dev libice-dev libsm-dev \ -gtk2-dev libxfce4util-dev startup-notification-dev xfconf-dev glade3-dev \ -xcb-util-dev" +BUILD_DEPENDS="intltool libx11-dev libice-dev libsm-dev gtk3-dev \ +libxfce4util-dev startup-notification-dev xfconf-dev glade3-dev glade-dev \ +xcb-util-dev" # gobject-introspection-dev vala SPLIT="$PACKAGE-dev $PACKAGE-glade3 $PACKAGE" +COPY_glade3="glade3/modules/*.so glade3/catalogs/ glade3/pixmaps/" +CAT_glade3="x-window|Glade3 module" + +DEPENDS_dev="$PACKAGE gtk3-dev libxfce4util-dev xfconf-dev" +DEPENDS_glade3="$PACKAGE glade3 glib gtk2" +DEPENDS_std="atk gdk-pixbuf glib gtk2 libcairo libice libsm libx11 \ +libxfce4util pango startup-notification xfconf" + +TAGS_std="Xfce" + compile_rules() { ./configure \ --disable-debug \ @@ -26,24 +37,14 @@ make install } -genpkg_rules() { - case $PACKAGE in - *-dev) - copy @dev - DEPENDS="libxfce4ui libxfce4ui-glade3 \ - gtk2-dev libxfce4util-dev xfconf-dev" - ;; - *-glade3) - copy glade3/ @rm - find $fs -name '*.la' -delete - DEPENDS="glade3 glib gtk2 libxfce4ui" - CAT="x-window|Glade3 module" - ;; - libxfce4ui) - copy @std @rm - DEPENDS="atk libcairo gdk-pixbuf glib gtk2 libxfce4util pango \ - startup-notification xfconf libice libsm libx11" - ;; - esac - TAGS="Xfce" -} +# use of "gobject-introspection-dev vala" in BUILD_DEPENDS produce errors: +# ** (process:5280): CRITICAL **: 02:49:10.805: Failed to get connection to xfconfd: The connection is closed +# ** (process:5484): CRITICAL **: 02:49:14.682: Failed to get connection to xfconfd: The connection is closed +# ** (g-ir-compiler:5507): CRITICAL **: 02:49:16.576: Failed to get connection to xfconfd: The connection is closed +# +# starting xfconfd using `/usr/lib/xfce4/xfconf/xfconfd` produce error: +# (xfconfd:1150): xfconfd-CRITICAL **: 02:48:43.550: Xfconfd failed to start: The connection is closed +# and nothing changed + +# use of "introspection" here require using "introspection" in the libxfce4util +# package (add "gobject-introspection-dev vala" to BUILD_DEPENDS there) diff -r 4035a0b6ff20 -r f3cf43fa2e55 libxfce4util/receipt --- a/libxfce4util/receipt Sat Jan 12 17:51:19 2019 +0200 +++ b/libxfce4util/receipt Mon Jan 14 00:11:29 2019 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="libxfce4util" -VERSION="4.12.1" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/ +VERSION="4.13.2" CATEGORY="x-window" SHORT_DESC="Xfce utility library" MAINTAINER="devel@slitaz.org" @@ -10,10 +10,16 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL" +TARBALL_SHA1="8ce7bcbea1b41298f1e7f6181afd27c1bbc079b5" -BUILD_DEPENDS="intltool glib-dev" +BUILD_DEPENDS="intltool glib-dev" # gobject-introspection-dev vala SPLIT="$PACKAGE-dev" +DEPENDS_std="glib" +DEPENDS_dev="$PACKAGE glib-dev" + +TAGS_std="Xfce" + compile_rules() { ./configure \ --disable-debug \ @@ -23,17 +29,3 @@ make && make install } - -genpkg_rules() { - case $PACKAGE in - libxfce4util) - copy @std - DEPENDS="glib" - ;; - *-dev) - copy @dev - DEPENDS="libxfce4util glib-dev" - ;; - esac - TAGS="Xfce" -} diff -r 4035a0b6ff20 -r f3cf43fa2e55 xfconf/receipt --- a/xfconf/receipt Sat Jan 12 17:51:19 2019 +0200 +++ b/xfconf/receipt Mon Jan 14 00:11:29 2019 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="xfconf" -VERSION="4.12.0" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/ +VERSION="4.13.6" CATEGORY="x-window" SHORT_DESC="Xfce configuration utility" MAINTAINER="devel@slitaz.org" @@ -10,42 +10,32 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL" +TARBALL_SHA1="e972e9f24508f8a435dd1d9230e0399a39773443" COOKOPTS="force-arch" # arch-specific paths -BUILD_DEPENDS="intltool libxfce4util-dev dbus-dev dbus-glib-dev \ +BUILD_DEPENDS="intltool libxfce4util-dev dbus-dev \ perl-extutils-depends perl-extutils-pkgconfig perl-glib perl-dev" SPLIT="$PACKAGE-dev $PACKAGE-perl $PACKAGE" +COPY_perl="/usr/lib/perl5/ @rm" +CAT_perl="perl|Perl bindings" + +DEPENDS_dev="$PACKAGE glib-dev" # use xfconf-perl separately if need +DEPENDS_perl="$PACKAGE glib perl" +DEPENDS_std="glib libxfce4util dbus" + +TAGS_std="Xfce" + compile_rules() { ./configure \ --disable-debug \ --disable-gtk-doc \ + --with-perl-options='INSTALLDIRS=vendor' \ $CONFIGURE_ARGS && fix libtool && make && make install || return 1 - chmod a+x $install/usr/lib/libxfconf-0.so.2.0.0 - find $install/usr/lib/perl5 -type f -exec chmod u+w '{}' \; + find $install -type f -exec chmod u+w '{}' \; # 444->644, 555->755 } - -genpkg_rules() { - case $PACKAGE in - *-dev) - copy @dev - DEPENDS="xfconf xfconf-perl \ - dbus-dev dbus-glib-dev glib-dev" - ;; - xfconf-perl) - copy /usr/lib/perl5/ @rm - DEPENDS="dbus dbus-glib glib perl xfconf" - CAT="perl|Perl bindings" - ;; - xfconf) - copy @std @rm - DEPENDS="dbus dbus-glib glib libxfce4util" - ;; - esac - TAGS="Xfce" -}