[notify] gtk: 2.24.32 -> 2.24.33 gtk-update-icon-cache has been moved from gtk to gtk3, update gtk before gtk3 to avoid file conflicts on gtk-update-icon-cache

you may still get a file conflict on immodules.cache this is safe to force orver write
This commit is contained in:
Danny Rawlins 2021-01-14 00:14:27 +11:00
parent 3038ce41dd
commit 00cf7db8e5
5 changed files with 27 additions and 27 deletions

View File

@ -3,10 +3,8 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/gtk-builder-convert
-rwxr-xr-x root/root usr/bin/gtk-query-immodules-2.0
-rwxr-xr-x root/root usr/bin/gtk-register
-rwxr-xr-x root/root usr/bin/gtk-update-icon-cache
drwxr-xr-x root/root usr/etc/
drwxr-xr-x root/root usr/etc/gtk-2.0/
-rw-r--r-- root/root usr/etc/gtk-2.0/gtk.immodules
-rw-r--r-- root/root usr/etc/gtk-2.0/im-multipress.conf
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/gail-1.0/
@ -285,6 +283,7 @@ drwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/
drwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/engines/
-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/engines/libpixmap.la
-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/engines/libpixmap.so
-rw-r--r-- root/root usr/lib/gtk-2.0/2.10.0/immodules.cache
drwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/immodules/
-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/immodules/im-am-et.la
-rwxr-xr-x root/root usr/lib/gtk-2.0/2.10.0/immodules/im-am-et.so
@ -325,13 +324,13 @@ lrwxrwxrwx root/root usr/lib/libgailutil.so -> libgailutil.so.18.0.1
lrwxrwxrwx root/root usr/lib/libgailutil.so.18 -> libgailutil.so.18.0.1
-rwxr-xr-x root/root usr/lib/libgailutil.so.18.0.1
-rw-r--r-- root/root usr/lib/libgdk-x11-2.0.la
lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.2400.32
lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.2400.32
-rwxr-xr-x root/root usr/lib/libgdk-x11-2.0.so.0.2400.32
lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.2400.33
lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.2400.33
-rwxr-xr-x root/root usr/lib/libgdk-x11-2.0.so.0.2400.33
-rw-r--r-- root/root usr/lib/libgtk-x11-2.0.la
lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.2400.32
lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.2400.32
-rwxr-xr-x root/root usr/lib/libgtk-x11-2.0.so.0.2400.32
lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.2400.33
lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.2400.33
-rwxr-xr-x root/root usr/lib/libgtk-x11-2.0.so.0.2400.33
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/gail.pc
-rw-r--r-- root/root usr/lib/pkgconfig/gdk-2.0.pc

View File

@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/cTkefy5uHA4hWQQa2YSfWviD8Kzl2IcHZJXoow8sU8NmsCEjHrAYEq1UgsoqVrUw8k/a4toU4ATHz8UXntGUwQ=
SHA256 (Pkgfile) = 7260d94984c2a62b9338c98f9d024c8fcd33a5833a3ab0a6bfba695b8318238f
SHA256 (.footprint) = 8eb997a460e45c05eadc45f39387b8c2dd439e415292520a71b15137f052b476
SHA256 (gtk+-2.24.32.tar.xz) = b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
SHA256 (gtk.immodules) = 728ffab4734db8f3304fb9dd6531fd20acd6c7078b8eec6a3d1e4fd4bd247b0b
SHA256 (gtk-register.sh) = d773b64a65410dfe5d9b3ac4eab163473fc28994973ea2bad692b36a988e11ad
RWSE3ohX2g5d/UrfptVWpCgnoZQoaWMDmLtX1dHvyO9iJhPaZdloRpbSUUHump3otzCBodGGTq11v2mGheFY5UUQBklQ+uvlhgs=
SHA256 (Pkgfile) = 2c1c587ffb72df24d92724408d65ca8511d5a1cac59715f51f551c06059fbb0e
SHA256 (.footprint) = 94276b5d06c74f40fa6ec191fa641401a4512bb82b1d568941eabe446340663f
SHA256 (gtk+-2.24.33.tar.xz) = ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da
SHA256 (gtk.immodules) = d5dbacc649e7f89a68cc322920de1c5faf2a9d3ddbcc8074ac555b26be19cc62
SHA256 (gtk-register.sh) = 8ad0b31beaf7475101fdc0a6f1aedd09681f11c704680cb2917d332320618929

View File

@ -1,23 +1,25 @@
# Description: A multi-platform toolkit for creating graphical user interfaces
# URL: https://www.gtk.org/
# Maintainer: Fredrik Rinnestam, fredrik at crux dot nu
# Depends on: atk, hicolor-icon-theme, gdk-pixbuf, pango, xorg-libxcursor, xorg-libxinerama, xorg-libxrandr, xorg-libxcomposite
# Maintainer: CRUX System Team, core-ports at crux dot nu
# Depends on: atk gdk-pixbuf hicolor-icon-theme pango xorg-libxcomposite xorg-libxcursor xorg-libxinerama xorg-libxrandr
name=gtk
version=2.24.32
version=2.24.33
release=1
source=(http://download.gnome.org/sources/gtk+/2.24/${name}+-$version.tar.xz \
source=(https://download.gnome.org/sources/gtk+/2.24/${name}+-$version.tar.xz
gtk.immodules gtk-register.sh)
build () {
build() {
cd gtk+-$version
./configure --prefix=/usr
make
make DESTDIR=$PKG install
mkdir -p $PKG/usr/etc/gtk-2.0
install -m 644 $SRC/gtk.immodules $PKG/usr/etc/gtk-2.0/
rm -r $PKG/usr/share/{locale,gtk-doc,gtk-2.0} $PKG/usr/bin/gtk-demo
install -m 0644 -D $SRC/gtk.immodules $PKG/usr/lib/gtk-2.0/2.10.0/immodules.cache
install -m 0755 $SRC/gtk-register.sh $PKG/usr/bin/gtk-register
rm -r \
$PKG/usr/share/{locale,gtk-doc,gtk-2.0} \
$PKG/usr/bin/{gtk-demo,gtk-update-icon-cache}
}

2
gtk/gtk-register.sh Normal file → Executable file
View File

@ -3,6 +3,6 @@
# /usr/bin/gtk-register: register input modules
#
/usr/bin/gtk-query-immodules-2.0 > /usr/etc/gtk-2.0/gtk.immodules
/usr/bin/gtk-query-immodules-2.0 --update-cache
# End of file

View File

@ -1,8 +1,6 @@
# GTK+ Input Method Modules file
# Automatically generated file, do not edit
# Created by /usr/bin/gtk-query-immodules-2.0 from gtk+-2.24.14
#
# ModulesPath = /home/fredrik/.gtk-2.0/2.10.0/x86_64-unknown-linux-gnu/immodules:/home/fredrik/.gtk-2.0/2.10.0/immodules:/home/fredrik/.gtk-2.0/x86_64-unknown-linux-gnu/immodules:/home/fredrik/.gtk-2.0/immodules:/usr/lib/gtk-2.0/2.10.0/x86_64-unknown-linux-gnu/immodules:/usr/lib/gtk-2.0/2.10.0/immodules:/usr/lib/gtk-2.0/x86_64-unknown-linux-gnu/immodules:/usr/lib/gtk-2.0/immodules
# Created by /usr/bin/gtk-query-immodules-2.0 from gtk+-2.24.33
#
"/usr/lib/gtk-2.0/2.10.0/immodules/im-am-et.so"
"am_et" "Amharic (EZ+)" "gtk20" "/usr/share/locale" "am"
@ -32,8 +30,9 @@
"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk20" "/usr/share/locale" "ti"
"/usr/lib/gtk-2.0/2.10.0/immodules/im-viqr.so"
"viqr" "Vietnamese (VIQR)" "gtk20" "/usr/share/locale" "vi"
"viqr" "Vietnamese (VIQR)" "gtk20" "/usr/share/locale" ""
"/usr/lib/gtk-2.0/2.10.0/immodules/im-xim.so"
"xim" "X Input Method" "gtk20" "/usr/share/locale" "ko:ja:th:zh"