diff --git a/adwaita-icon-theme-legacy/.SRCINFO b/adwaita-icon-theme-legacy/.SRCINFO index 0613af77ad..b7b9649ed1 100644 --- a/adwaita-icon-theme-legacy/.SRCINFO +++ b/adwaita-icon-theme-legacy/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = adwaita-icon-theme-legacy pkgdesc = GNOME fallback icons for legacy apps pkgver = 46.2 - pkgrel = 1 + pkgrel = 3 url = https://gitlab.gnome.org/GNOME/adwaita-icon-theme-legacy arch = any license = CC-BY-SA-3.0 OR LGPL-3.0-only @@ -10,6 +10,8 @@ pkgbase = adwaita-icon-theme-legacy makedepends = meson depends = hicolor-icon-theme source = git+https://gitlab.gnome.org/GNOME/adwaita-icon-theme-legacy.git#tag=46.2 + source = adwaita-icon-theme-legacy-unique-license-directory.patch b2sums = 0b36191ec591db2cd6d2d1943a0139cc95e7ac7ba2ad1828a8d104544d264d58eaac9acf8c1c6c6cc4a648bd302711d8aba7ea33b3eee9bf3e3d5a0751782b25 + b2sums = da4a2fe70e29be583f2d8c23772059c94f90ad71509f459b1c8b37ec69d870cfd2e4cfb792dc3302506a496d8a140f61f073a09ed3200702200d51241fd7d65d pkgname = adwaita-icon-theme-legacy diff --git a/adwaita-icon-theme-legacy/.nvchecker.toml b/adwaita-icon-theme-legacy/.nvchecker.toml new file mode 100644 index 0000000000..5382af0e0b --- /dev/null +++ b/adwaita-icon-theme-legacy/.nvchecker.toml @@ -0,0 +1,4 @@ +[adwaita-icon-theme-legacy] +source = "git" +git = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme-legacy.git" +include_regex = '\d+(\.\d+)*' diff --git a/adwaita-icon-theme-legacy/PKGBUILD b/adwaita-icon-theme-legacy/PKGBUILD index 85640b0d0f..9872e0c306 100644 --- a/adwaita-icon-theme-legacy/PKGBUILD +++ b/adwaita-icon-theme-legacy/PKGBUILD @@ -4,7 +4,7 @@ pkgname=adwaita-icon-theme-legacy pkgver=46.2 -pkgrel=1 +pkgrel=3 pkgdesc="GNOME fallback icons for legacy apps" url="https://gitlab.gnome.org/GNOME/adwaita-icon-theme-legacy" arch=(any) @@ -15,11 +15,21 @@ makedepends=( gtk-update-icon-cache meson ) -source=("git+https://gitlab.gnome.org/GNOME/adwaita-icon-theme-legacy.git#tag=${pkgver/[a-z]/.&}") -b2sums=('0b36191ec591db2cd6d2d1943a0139cc95e7ac7ba2ad1828a8d104544d264d58eaac9acf8c1c6c6cc4a648bd302711d8aba7ea33b3eee9bf3e3d5a0751782b25') +source=("git+https://gitlab.gnome.org/GNOME/adwaita-icon-theme-legacy.git#tag=${pkgver/[a-z]/.&}" + adwaita-icon-theme-legacy-unique-license-directory.patch) +b2sums=('0b36191ec591db2cd6d2d1943a0139cc95e7ac7ba2ad1828a8d104544d264d58eaac9acf8c1c6c6cc4a648bd302711d8aba7ea33b3eee9bf3e3d5a0751782b25' + 'da4a2fe70e29be583f2d8c23772059c94f90ad71509f459b1c8b37ec69d870cfd2e4cfb792dc3302506a496d8a140f61f073a09ed3200702200d51241fd7d65d') prepare() { cd $pkgname + + # Add missing icons needed by GNOME Flashback + # https://gitlab.gnome.org/GNOME/adwaita-icon-theme-legacy/-/merge_requests/2 + git cherry-pick -n 2b2eb1bbf215e73f3e6f1be79ee679b17dc43eb3 + + # Use a unique licenses directory + # https://gitlab.gnome.org/GNOME/adwaita-icon-theme-legacy/-/merge_requests/1 + git apply -3 ../adwaita-icon-theme-legacy-unique-license-directory.patch } build() { @@ -33,9 +43,6 @@ check() { package() { meson install -C build --destdir "$pkgdir" - - # Covered by common licenses - rm -r "$pkgdir/usr/share/licenses" } # vim:set sw=2 sts=-1 et: diff --git a/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy-unique-license-directory.patch b/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy-unique-license-directory.patch new file mode 100644 index 0000000000..efa68885a4 --- /dev/null +++ b/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy-unique-license-directory.patch @@ -0,0 +1,26 @@ +From 7075510207510fa34dc30a618974e467f7f5000f Mon Sep 17 00:00:00 2001 +From: Chris Mayo +Date: Sun, 26 May 2024 19:17:36 +0100 +Subject: [PATCH] Use a unique licenses directory + +Avoid clashing with adwaita-icon-theme. +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 5b4a4c0..abe27b4 100644 +--- a/meson.build ++++ b/meson.build +@@ -7,7 +7,7 @@ pkg.generate( + dataonly : true, + ) + +-licenses_dir = get_option('datadir') / 'licenses' / 'adwaita-icon-theme' ++licenses_dir = get_option('datadir') / 'licenses' / 'adwaita-icon-theme-legacy' + install_data('COPYING', install_dir : licenses_dir, install_tag : 'runtime') + install_data('COPYING_CCBYSA3', install_dir : licenses_dir, install_tag : 'runtime') + install_data('COPYING_LGPL', install_dir : licenses_dir, install_tag : 'runtime') +-- +GitLab +