summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhorsemanoffaith2018-01-20 22:03:57 -0800
committerhorsemanoffaith2018-01-20 22:03:57 -0800
commit59d5abeaed6e73df09abdb49bbdfcd40f3e5e904 (patch)
tree80170cb4c60f368b3620bc1fc31378f85b8400e9
parent110a74f91c78b4196ac52a4c45aa3ba1fcb4d8e6 (diff)
downloadaur-59d5abeaed6e73df09abdb49bbdfcd40f3e5e904.tar.gz
update to version 3.22.26+47+g3a1a7135a2
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD16
2 files changed, 6 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 31064394ee8..aa75cc34061 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gtk3-ubuntu
pkgdesc = GObject-based multi-platform toolkit
- pkgver = 3.22.26+47+g3a1a7135a2
+ pkgver = 3.22.26
pkgrel = 1
url = http://www.gtk.org/
install = gtk3.install
@@ -39,6 +39,7 @@ pkgbase = gtk3-ubuntu
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
@@ -46,7 +47,7 @@ pkgbase = gtk3-ubuntu
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+47+g3a1a7135a2-2ubuntu1.debian.tar.xz
+ source = https://launchpad.net/ubuntu/+archive/primary/+files/gtk+3.0_3.22.26-2ubuntu1.debian.tar.xz
sha512sums = SKIP
sha512sums = aa57f33b55ef858e9ddb305c01ddd4c995c6cbb0ea429844e5b6e77321192909090e6f77de7d4484c46838bdba989105bfefdff594f46dc80544820bcffcfb46
sha512sums = d369ea456ee48c371506dedc5e0ca8d60d9bcca9362dc76caaa4d70adf67b32524aabcb2383136cbbf023dadcba0c54a37db25cde89944d1cfe2ae7ac8bd9258
@@ -83,12 +84,8 @@ pkgname = gtk3-ubuntu
depends = wayland
depends = wayland-protocols
depends = gtk-update-icon-cache
+ depends = gtk-update-icon-cache
provides = gtk3-print-backends
conflicts = gtk3-print-backends
replaces = gtk3-print-backends<=3.22.26-1
-pkgname = gtk-update-icon-cache
- pkgdesc = GTK+ icon cache updater
- depends = gdk-pixbuf2
- depends = hicolor-icon-theme
-
diff --git a/PKGBUILD b/PKGBUILD
index 0fa53a6e230..c0c58c907c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,8 +9,7 @@
_use_ppa=true
-pkgbase=gtk3-ubuntu
-pkgname=(gtk3-ubuntu gtk-update-icon-cache-ubuntu)
+pkgname=gtk3-ubuntu
_ubuntu_rel=2ubuntu1
pkgver=3.22.26
pkgrel=1
@@ -21,7 +20,7 @@ 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)
+ wayland-protocols gtk-update-icon-cache)
makedepends=(colord gobject-introspection git gtk-doc libcanberra rest libcups glib2-docs sassc)
license=(LGPL)
_commit=3a1a7135a276f2b6336c7566f6342da739a41d39 # gtk-3-22
@@ -117,14 +116,3 @@ package_gtk3-ubuntu() {
}
-package_gtk-update-icon-cache-ubuntu() {
- pkgdesc="GTK+ icon cache updater"
- depends=(gdk-pixbuf2 hicolor-icon-theme)
- provides=(gtk-update-icon-cache)
- conflicts=(gtk-update-icon-cache)
-
- 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"
-}