summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSung Mingi2022-06-23 17:14:33 +0900
committerSung Mingi2022-06-23 17:14:40 +0900
commit75bae7c4dfc9dc06609112c9434858365f519deb (patch)
tree9e80aed4272bf9277975b040d4ce323702833d12
parentd1f1fde6e764f6c12216b3f9fb1b23d8a8927955 (diff)
downloadaur-75bae7c4dfc9dc06609112c9434858365f519deb.tar.gz
3.12.0-7
* Add a patch from * https://sources.debian.org/patches/gnome-icon-theme/3.12.0-5/0001-configure.ac-Do-not-manually-set-localedir.patch/ * * Also run `autoupdate & autoreconf` before running `./configure` Signed-off-by: Sung Mingi <FiestaLake@protonmail.com>
-rw-r--r--.SRCINFO5
-rw-r--r--0001-configure.ac-Do-not-manually-set-localedir.patch25
-rw-r--r--PKGBUILD19
3 files changed, 42 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 04da9bc23b07..09e1d62840b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
pkgbase = gnome-icon-theme
pkgdesc = GNOME icon theme
pkgver = 3.12.0
- pkgrel = 6
+ pkgrel = 7
url = http://www.gnome.org
arch = any
license = GPL
makedepends = intltool
makedepends = icon-naming-utils
depends = hicolor-icon-theme
- depends = gtk-update-icon-cache
depends = gnome-icon-theme-symbolic
options = !emptydirs
source = https://download.gnome.org/sources/gnome-icon-theme/3.12/gnome-icon-theme-3.12.0.tar.xz
+ source = 0001-configure.ac-Do-not-manually-set-localedir.patch
sha256sums = 359e720b9202d3aba8d477752c4cd11eced368182281d51ffd64c8572b4e503a
+ sha256sums = 02e47f80f36904071d7377d7b06083e3ce5f70c9b1ce2d190ac4a1bb90efcac8
pkgname = gnome-icon-theme
diff --git a/0001-configure.ac-Do-not-manually-set-localedir.patch b/0001-configure.ac-Do-not-manually-set-localedir.patch
new file mode 100644
index 000000000000..80b72ec7f2d3
--- /dev/null
+++ b/0001-configure.ac-Do-not-manually-set-localedir.patch
@@ -0,0 +1,25 @@
+From: Boyuan Yang <byang@debian.org>
+Date: Fri, 3 Sep 2021 02:17:43 -0400
+Subject: configure.ac: Do not manually set localedir
+
+Manually setting localedir conflicts with the automatically
+generated localedir variable in autoconf 2.70+.
+
+Bug-Debian: https://bugs.debian.org/978823
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 754676f..fdd856d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,8 +13,6 @@ IT_PROG_INTLTOOL([0.40.0])
+
+ GETTEXT_PACKAGE="${PACKAGE}"
+ AC_SUBST(GETTEXT_PACKAGE)
+-localedir='$(prefix)/$(DATADIRNAME)/locale'
+-AC_SUBST(localedir)
+
+ # Workaround to make aclocal get the right flags
+ AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
diff --git a/PKGBUILD b/PKGBUILD
index d1a5cf871927..073f62784e3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Sung Mingi <FiestaLake@protonmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=gnome-icon-theme
pkgver=3.12.0
-pkgrel=6
+pkgrel=7
pkgdesc="GNOME icon theme"
arch=(any)
depends=('hicolor-icon-theme' 'gtk-update-icon-cache' 'gnome-icon-theme-symbolic')
@@ -10,11 +11,19 @@ makedepends=('intltool' 'icon-naming-utils')
url="http://www.gnome.org"
license=('GPL')
options=('!emptydirs')
-source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('359e720b9202d3aba8d477752c4cd11eced368182281d51ffd64c8572b4e503a')
+source=("https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz"
+ "0001-configure.ac-Do-not-manually-set-localedir.patch")
+sha256sums=('359e720b9202d3aba8d477752c4cd11eced368182281d51ffd64c8572b4e503a'
+ '02e47f80f36904071d7377d7b06083e3ce5f70c9b1ce2d190ac4a1bb90efcac8')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -Np1 -i "../0001-configure.ac-Do-not-manually-set-localedir.patch"
+}
build() {
cd "$pkgname-$pkgver"
+ autoupdate && autoreconf
./configure --prefix=/usr
make
}
@@ -22,5 +31,5 @@ build() {
package() {
cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
- rm -f "${pkgdir}/usr/share/icons/gnome/icon-theme.cache"
+ rm -f "${pkgdir}/usr/share/icons/gnome/icon-theme.cache"
}