wok-next rev 21115
Update gtk3
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sat Jan 12 17:51:19 2019 +0200 (2019-01-12) |
| parents | 742d2b96f24d |
| children | f3cf43fa2e55 |
| files | gtk2/.icon.png gtk2/receipt gtk3/receipt gtk3/stuff/patches/gtk-3.24.2-typo.patch gtk3/stuff/patches/series |
line diff
1.1 Binary file gtk2/.icon.png has changed
2.1 --- a/gtk2/receipt Sat Jan 12 15:31:59 2019 +0200 2.2 +++ b/gtk2/receipt Sat Jan 12 17:51:19 2019 +0200 2.3 @@ -40,9 +40,11 @@ 2.4 make && 2.5 make install || return 1 2.6 2.7 - touch $install/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache 2.8 + mkdir -p $install/usr/lib/gdk-pixbuf-2.0/2.10.0/ 2.9 + touch $install/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache 2.10 ln -s ../../usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ 2.11 $install/etc/gtk-2.0/gdk-pixbuf.loaders 2.12 + 2.13 install -Dm644 $stuff/gtk2-demo.desktop \ 2.14 $install/usr/share/applications/gtk2-demo.desktop 2.15 }
3.1 --- a/gtk3/receipt Sat Jan 12 15:31:59 2019 +0200 3.2 +++ b/gtk3/receipt Sat Jan 12 17:51:19 2019 +0200 3.3 @@ -1,30 +1,56 @@ 3.4 # SliTaz package receipt v2. 3.5 3.6 PACKAGE="gtk3" 3.7 -VERSION="3.24.1" 3.8 +VERSION="3.24.2" 3.9 CATEGORY="x-window" 3.10 -SHORT_DESC="GNOME Toolkit 3" # it isn't GIMP Toolkit, don't try to convince me 3.11 +SHORT_DESC="GNOME Toolkit 3" 3.12 MAINTAINER="al.bobylev@gmail.com" 3.13 LICENSE="LGPL2" 3.14 WEB_SITE="https://www.gtk.org/" 3.15 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/gtk3.html" 3.16 -REPOLOGY="gtk3" 3.17 3.18 TARBALL="gtk+-$VERSION.tar.xz" 3.19 WGET_URL="$GNOME_MIRROR/gtk+/${VERSION%.*}/$TARBALL" 3.20 +TARBALL_SHA1="3c1d2c716cd17ac85554b130f92c22dadb4e04ad" 3.21 3.22 -COOKOPTS="force-arch" # different .pc 3.23 - 3.24 -BUILD_DEPENDS="libsm-dev" 3.25 BUILD_DEPENDS="gettext-dev wayland-protocols-dev wayland-dev glib-dev atk-dev \ 3.26 -pango-dev cairo-dev gdk-pixbuf-dev libxinerama-dev libxi-dev \ 3.27 -libxrandr-dev libxcomposite-dev libxdamage-dev libxkbcommon-dev \ 3.28 -mesa-dev libepoxy-dev at-spi2-atk-dev iso-codes-dev cups-dev rest-dev \ 3.29 -json-glib-dev gobject-introspection-dev colord-dev gtk-doc libxslt " 3.30 +pango-dev cairo-dev gdk-pixbuf-dev libxinerama-dev libxi-dev libxrandr-dev \ 3.31 +libxcomposite-dev libxdamage-dev libxkbcommon-dev mesa-dev libepoxy-dev \ 3.32 +at-spi2-atk-dev iso-codes-dev cups-dev rest-dev json-glib-dev \ 3.33 +gobject-introspection-dev colord-dev gtk-doc libxslt" 3.34 SPLIT="$PACKAGE-demo $PACKAGE-widget-factory $PACKAGE-icon-browser \ 3.35 $PACKAGE-broadwayd $PACKAGE-dev $PACKAGE" 3.36 3.37 -COOKOPTS="skip-log-errors" # Failed to open file ?./gdk.gresource.xml?: No such file or directory 3.38 +COPY_demo="gtk3-demo gtk3-demo-application gtk3-demo.desktop gtk3-demo*.png *Demo* *exampleapp*" 3.39 +COPY_widget_factory="gtk3-widget-factory gtk3-widget-factory.desktop gtk3-widget-factory*.png" 3.40 +COPY_icon_browser="gtk3-icon-browser gtk3-icon-browser.desktop" 3.41 +COPY_broadwayd="broadwayd" 3.42 +COPY_dev="@dev *.its *.loc *.rng" 3.43 +COPY_std="etc/ bin/ themes/ *.so* *.xml @rm" 3.44 + 3.45 +CAT_demo="development|example code and demo" 3.46 +CAT_widget_factory="development|widget factory" 3.47 +CAT_icon_browser="development|icon browser" 3.48 +CAT_broadwayd="x-window|HTML5 GTK backend" 3.49 + 3.50 +DEPENDS_demo="$PACKAGE libcairo gdk-pixbuf glib libepoxy libharfbuzz pango" 3.51 +DEPENDS_widget_factory="$PACKAGE atk libcairo gdk-pixbuf glib" 3.52 +DEPENDS_icon_browser="$PACKAGE glib" 3.53 +DEPENDS_broadwayd="libcairo glib" 3.54 +DEPENDS_dev="$PACKAGE at-spi2-atk-dev atk-dev cairo-dev fontconfig-dev \ 3.55 +gdk-pixbuf-dev glib-dev libepoxy-dev libx11-dev libxcomposite-dev \ 3.56 +libxdamage-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev \ 3.57 +libxkbcommon-dev libxrandr-dev mesa-dev pango-dev wayland-dev \ 3.58 +wayland-protocols-dev" 3.59 +DEPENDS_std="at-spi2-atk atk colord fontconfig freetype gdk-pixbuf glib \ 3.60 +json-glib libcairo libcups libepoxy libharfbuzz libx11 libxcomposite \ 3.61 +libxdamage libxext libxfixes libxi libxinerama libxkbcommon libxrandr \ 3.62 +mesa-libwayland-egl pango rest wayland" 3.63 +CONFIG_FILES_std="/etc/gtk-3.0/settings.ini" 3.64 + 3.65 +# skip-log-errors: Failed to open file ?./gdk.gresource.xml?: No such file or directory 3.66 +# force-arch: different .pc 3.67 +COOKOPTS="!menus skip-log-errors force-arch" 3.68 3.69 compile_rules() { 3.70 ./configure \ 3.71 @@ -48,54 +74,7 @@ 3.72 make install || return 1 3.73 3.74 cp -f $stuff/settings.ini $install/etc/gtk-3.0 3.75 -# find $install -name '*.desktop' | xargs sed -i '/NoDisplay/d' 3.76 -} 3.77 - 3.78 -genpkg_rules() { 3.79 - case $PACKAGE in 3.80 - *-demo) 3.81 - copy gtk3-demo* *Demo* *exampleapp* 3.82 - rm -r $fs/usr/share/gtk-doc $fs/usr/share/man 3.83 - CAT="development|example code and demo" 3.84 - DEPENDS="libcairo gdk-pixbuf glib gtk3 libepoxy libharfbuzz pango" 3.85 - ;; 3.86 - *-widget-factory) 3.87 - copy gtk3-widget* 3.88 - rm -r $fs/usr/share/gtk-doc $fs/usr/share/man 3.89 - CAT="development|widget factory" 3.90 - DEPENDS="atk libcairo gdk-pixbuf glib gtk3" 3.91 - ;; 3.92 - *-icon-browser) 3.93 - copy gtk3-icon-browser gtk3-icon-browser.desktop 3.94 - CAT="development|icon browser" 3.95 - DEPENDS="glib gtk3" 3.96 - ;; 3.97 - *-broadwayd) 3.98 - copy broadwayd 3.99 - CAT="x-window|HTML5 GTK backend" 3.100 - DEPENDS="libcairo glib" 3.101 - ;; 3.102 - *-dev) 3.103 - copy @dev *.its *.loc *.rng 3.104 - DEPENDS="gtk3 \ 3.105 - at-spi2-atk-dev atk-dev cairo-dev fontconfig-dev gdk-pixbuf-dev \ 3.106 - glib-dev libepoxy-dev libxkbcommon-dev mesa-dev pango-dev \ 3.107 - wayland-dev wayland-protocols-dev libx11-dev \ 3.108 - libxcomposite-dev libxdamage-dev libxext-dev \ 3.109 - libxfixes-dev libxi-dev libxinerama-dev \ 3.110 - libxrandr-dev" 3.111 - ;; 3.112 - *) 3.113 - COOKOPTS="!menus" 3.114 - copy etc/ bin/ themes/ *.so* *.xml @rm 3.115 - DEPENDS="at-spi2-atk atk libcairo colord fontconfig freetype \ 3.116 - gdk-pixbuf glib json-glib libcups libepoxy libharfbuzz \ 3.117 - libxkbcommon mesa-libwayland-egl pango rest wayland libx11 \ 3.118 - libxcomposite libxdamage libxext libxfixes \ 3.119 - libxi libxinerama libxrandr" 3.120 - CONFIG_FILES="/etc/gtk-3.0/settings.ini" 3.121 - ;; 3.122 - esac 3.123 + find $install -name '*.desktop' | xargs sed -i '/NoDisplay/d' 3.124 } 3.125 3.126 post_install_gtk3() {
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/gtk3/stuff/patches/gtk-3.24.2-typo.patch Sat Jan 12 17:51:19 2019 +0200 4.3 @@ -0,0 +1,11 @@ 4.4 +--- a/docs/tools/shooter.c 4.5 ++++ b/docs/tools/shooter.c 4.6 +@@ -170,7 +170,7 @@ 4.7 + y_orig = 0; 4.8 + } 4.9 + 4.10 +- if (x_orig + width > gdk_screen_get_width (gdk_screen_get_dfeault ())) 4.11 ++ if (x_orig + width > gdk_screen_get_width (gdk_screen_get_default ())) 4.12 + width = gdk_screen_width () - x_orig; 4.13 + 4.14 + if (y_orig + height > gdk_screen_get_height (gdk_screen_get_default ()))