diff options
| -rw-r--r-- | .SRCINFO | 35 | ||||
| -rw-r--r-- | PKGBUILD | 63 |
2 files changed, 56 insertions, 42 deletions
@@ -1,18 +1,13 @@ pkgbase = gtk3-ubuntu pkgdesc = GObject-based multi-platform toolkit - pkgver = 3.22.26 + pkgver = 3.22.28+74+gcc967849f7 pkgrel = 1 url = http://www.gtk.org/ - install = gtk3.install arch = x86_64 license = LGPL - makedepends = colord makedepends = gobject-introspection makedepends = git makedepends = gtk-doc - makedepends = libcanberra - makedepends = rest - makedepends = libcups makedepends = glib2-docs makedepends = sassc depends = adwaita-icon-theme @@ -20,11 +15,15 @@ pkgbase = gtk3-ubuntu depends = atk depends = cairo depends = cantarell-fonts + depends = colord depends = dconf depends = desktop-file-utils depends = gdk-pixbuf2 depends = gtk-update-icon-cache depends = json-glib + depends = libcanberra + depends = libcloudproviders + depends = libcups depends = libepoxy depends = librsvg depends = libxcomposite @@ -36,26 +35,23 @@ pkgbase = gtk3-ubuntu depends = libxrandr depends = mesa depends = pango + depends = rest depends = shared-mime-info depends = wayland depends = wayland-protocols depends = gtk-update-icon-cache - source = git+https://git.gnome.org/browse/gtk+#commit=3a1a7135a276f2b6336c7566f6342da739a41d39 - source = 0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch - source = ubuntu_gtk_custom_menu_items.patch + source = git+https://gitlab.gnome.org/GNOME/gtk.git#commit=cc967849f7653c697c33571a1a6a55e9ffd966ff source = settings.ini source = gtk-query-immodules-3.0.hook source = gtk-update-icon-cache.hook source = gtk-update-icon-cache.script - source = https://launchpad.net/ubuntu/+archive/primary/+files/gtk+3.0_3.22.26-2ubuntu1.debian.tar.xz + source = https://launchpad.net/ubuntu/+archive/primary/+files/gtk+3.0_3.22.28-1ubuntu3.debian.tar.xz sha512sums = SKIP - sha512sums = aa57f33b55ef858e9ddb305c01ddd4c995c6cbb0ea429844e5b6e77321192909090e6f77de7d4484c46838bdba989105bfefdff594f46dc80544820bcffcfb46 - sha512sums = d369ea456ee48c371506dedc5e0ca8d60d9bcca9362dc76caaa4d70adf67b32524aabcb2383136cbbf023dadcba0c54a37db25cde89944d1cfe2ae7ac8bd9258 sha512sums = ad2c0b0388f4169592b9574f0b3db673a969b7c4721548c4ac7c438eddbcdc378fcaac04e2b6c858a1562cc23ddf4804e5f7be08068340b7c9365e2b11ddcfb8 sha512sums = f0ffd95544863f2e10fda81488b4727aa9a8a35a7d39fb96872db6664d03442db2b58af788b5990825c7b3a83681f7220ca481409cca5421dfb39b9a3bbac9ac sha512sums = abfd73de4faa6f53784182800395aa3c39bb98e15a0eb300fb4142073ff7ce565a0836a2363393b2f132060b5293dbc0c30c380a023f38d5bd39c62cb58389c2 sha512sums = 5cd50d93bb6bc203438a2a0764bd717409658e124058b18a1da26a21f10ef7564a16f32fc0633a68b45b2e303fa63a5efefeadd6b0bf1d7f474556df8cdb6c58 - sha512sums = 7b31b41ec7b0b96b69d55bc782921d57cc3329faade0c81522c9ae2be9a143e8a5edfd8ed57c84db404f7301ed89ea59b3d6defec34aa968cc9de8b0f35dd6f7 + sha512sums = 10e00f9e8e4e8c9b28e44b0013a3d8bc283adb5e8c931730a998da45ba6b76c9349113deb489bc9dd418b338fba2a2190cea8aaf653ae72e9f4678cdd734ded1 pkgname = gtk3-ubuntu install = gtk3.install @@ -64,11 +60,15 @@ pkgname = gtk3-ubuntu depends = atk depends = cairo depends = cantarell-fonts + depends = colord depends = dconf depends = desktop-file-utils depends = gdk-pixbuf2 depends = gtk-update-icon-cache depends = json-glib + depends = libcanberra + depends = libcloudproviders + depends = libcups depends = libepoxy depends = librsvg depends = libxcomposite @@ -80,6 +80,7 @@ pkgname = gtk3-ubuntu depends = libxrandr depends = mesa depends = pango + depends = rest depends = shared-mime-info depends = wayland depends = wayland-protocols @@ -89,3 +90,11 @@ pkgname = gtk3-ubuntu conflicts = gtk3-print-backends replaces = gtk3-print-backends<=3.22.26-1 +pkgname = gtk-update-icon-cache-ubuntu + pkgdesc = GTK+ icon cache updater + depends = gdk-pixbuf2 + depends = librsvg + depends = hicolor-icon-theme + provides = gtk-update-icon-cache + conflicts = gtk-update-icon-cache + @@ -9,50 +9,44 @@ _use_ppa=true -pkgname=gtk3-ubuntu -_ubuntu_rel=2ubuntu1 -pkgver=3.22.26 +pkgbase=gtk3-ubuntu +pkgname=(gtk3-ubuntu gtk-update-icon-cache-ubuntu) +_ubuntu_ver=3.22.28 +_ubuntu_rel=1ubuntu3 +pkgver=3.22.28+74+gcc967849f7 pkgrel=1 pkgdesc="GObject-based multi-platform toolkit" arch=(x86_64) url="http://www.gtk.org/" -install=gtk3.install -depends=(adwaita-icon-theme at-spi2-atk atk cairo cantarell-fonts dconf desktop-file-utils - gdk-pixbuf2 gtk-update-icon-cache json-glib libepoxy librsvg libxcomposite libxcursor - libxdamage libxi libxinerama libxkbcommon libxrandr mesa pango shared-mime-info wayland - wayland-protocols gtk-update-icon-cache) -makedepends=(colord gobject-introspection git gtk-doc libcanberra rest libcups glib2-docs sassc) +depends=(adwaita-icon-theme at-spi2-atk atk cairo cantarell-fonts colord dconf desktop-file-utils + gdk-pixbuf2 gtk-update-icon-cache json-glib libcanberra libcloudproviders libcups libepoxy + librsvg libxcomposite libxcursor libxdamage libxi libxinerama libxkbcommon libxrandr mesa + pango rest shared-mime-info wayland wayland-protocols gtk-update-icon-cache) +makedepends=(gobject-introspection git gtk-doc glib2-docs sassc) license=(LGPL) -_commit=3a1a7135a276f2b6336c7566f6342da739a41d39 # gtk-3-22 -source=("git+https://git.gnome.org/browse/gtk+#commit=$_commit" - 0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch - ubuntu_gtk_custom_menu_items.patch +_commit=cc967849f7653c697c33571a1a6a55e9ffd966ff # gtk-3-22 +source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit" settings.ini - gtk-query-immodules-3.0.hook + gtk-query-immodules-3.0.hook gtk-update-icon-cache.hook gtk-update-icon-cache.script) source+=("https://launchpad.net/ubuntu/+archive/primary/+files/gtk+3.0_${_ubuntu_ver:-${pkgver}}-${_ubuntu_rel}.debian.tar.xz") sha512sums=('SKIP' - 'aa57f33b55ef858e9ddb305c01ddd4c995c6cbb0ea429844e5b6e77321192909090e6f77de7d4484c46838bdba989105bfefdff594f46dc80544820bcffcfb46' - 'd369ea456ee48c371506dedc5e0ca8d60d9bcca9362dc76caaa4d70adf67b32524aabcb2383136cbbf023dadcba0c54a37db25cde89944d1cfe2ae7ac8bd9258' 'ad2c0b0388f4169592b9574f0b3db673a969b7c4721548c4ac7c438eddbcdc378fcaac04e2b6c858a1562cc23ddf4804e5f7be08068340b7c9365e2b11ddcfb8' 'f0ffd95544863f2e10fda81488b4727aa9a8a35a7d39fb96872db6664d03442db2b58af788b5990825c7b3a83681f7220ca481409cca5421dfb39b9a3bbac9ac' 'abfd73de4faa6f53784182800395aa3c39bb98e15a0eb300fb4142073ff7ce565a0836a2363393b2f132060b5293dbc0c30c380a023f38d5bd39c62cb58389c2' '5cd50d93bb6bc203438a2a0764bd717409658e124058b18a1da26a21f10ef7564a16f32fc0633a68b45b2e303fa63a5efefeadd6b0bf1d7f474556df8cdb6c58' - '7b31b41ec7b0b96b69d55bc782921d57cc3329faade0c81522c9ae2be9a143e8a5edfd8ed57c84db404f7301ed89ea59b3d6defec34aa968cc9de8b0f35dd6f7') + '10e00f9e8e4e8c9b28e44b0013a3d8bc283adb5e8c931730a998da45ba6b76c9349113deb489bc9dd418b338fba2a2190cea8aaf653ae72e9f4678cdd734ded1') pkgver() { - cd gtk+ + cd gtk git describe --tags | sed 's/-/+/g' } prepare() { - cd gtk+ - - # https://bugs.archlinux.org/task/56474 - patch -Np1 -i ../0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch + cd gtk local patches=( 016_no_offscreen_widgets_grabbing.patch @@ -62,14 +56,13 @@ prepare() { no-accessibility-dump.patch bzg_gtkcellrenderer_grabbing_modifier.patch print-dialog-show-options-of-remote-dnssd-printers.patch - ubuntu_gtk_custom_menu_items.patch - uimanager-guard-against-nested-node-updates.patch + uimanager-guard-against-nested-node-updates.patch x-canonical-accel.patch message-dialog-restore-traditional-look-on-unity.patch 0001-calendar-always-emit-day-selected-once.patch 0001-gtkwindow-set-transparent-background-color.patch - ubuntu_fileselector_behaviour.patch - unity-border-radius.patch + ubuntu_gtk_custom_menu_items.patch + unity-border-radius.patch unity-headerbar-maximized-mode.patch ) @@ -82,7 +75,7 @@ prepare() { } build() { - cd gtk+ + cd gtk CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -106,13 +99,25 @@ package_gtk3-ubuntu() { replaces=("gtk3-print-backends<=3.22.26-1") install=gtk3.install - cd gtk+ - make DESTDIR="${pkgdir}" install + cd gtk + make DESTDIR="$pkgdir" install install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini" install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook" + # split this out to use with gtk2 too rm "$pkgdir/usr/bin/gtk-update-icon-cache" +} + +package_gtk-update-icon-cache-ubuntu() { + pkgdesc="GTK+ icon cache updater" + provides=(gtk-update-icon-cache) + conflicts=(gtk-update-icon-cache) + depends=(gdk-pixbuf2 librsvg hicolor-icon-theme) + cd gtk + install -D gtk/gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache" + install -Dm644 ../gtk-update-icon-cache.hook "$pkgdir/usr/share/libalpm/hooks/gtk-update-icon-cache.hook" + install -D ../gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache" } |