Date: Thursday, December 15, 2022 @ 14:12:52
  Author: foutrelis
Revision: 464385

upgpkg: xfce4-settings 4.18.0-1: switch to elementary icon theme

adwaita-icon-theme>=42 does not provide a complete icon theme anymore.

https://bugs.archlinux.org/task/74350
https://gitlab.xfce.org/xfce/garcon/-/issues/35

Modified:
  xfce4-settings/trunk/PKGBUILD
  xfce4-settings/trunk/default-xsettings-xml.patch

-----------------------------+
 PKGBUILD                    |   22 ++++++++--------------
 default-xsettings-xml.patch |    2 +-
 2 files changed, 9 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-12-15 14:01:55 UTC (rev 464384)
+++ PKGBUILD    2022-12-15 14:12:52 UTC (rev 464385)
@@ -3,41 +3,35 @@
 # Contributor: Corrado Primier <[email protected]>
 
 pkgname=xfce4-settings
-pkgver=4.16.5
+pkgver=4.18.0
 pkgrel=1
-pkgdesc="Settings manager of the Xfce desktop"
+pkgdesc="Xfce's Configuration System"
 arch=('x86_64')
 url="https://docs.xfce.org/xfce/xfce4-settings/start";
 license=('GPL2')
 groups=('xfce4')
 depends=('exo' 'garcon' 'libxfce4ui' 'xfconf' 'libnotify' 'libcanberra'
-         'colord' 'libxklavier' 'adwaita-icon-theme' 'gnome-themes-extra')
+         'colord' 'libxklavier' 'elementary-icon-theme' 'gnome-themes-extra')
 makedepends=('intltool' 'xf86-input-libinput')
 optdepends=('python: xfce4-compose-mail -- "mailto:"; URI handling')
 
source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
-        
$pkgname-fix-ColorSettings-release.patch::https://gitlab.xfce.org/xfce/xfce4-settings/-/commit/4bc8ef847a1a.patch
         default-xsettings-xml.patch)
-sha256sums=('7a4f74802486d7e77a1c9fa4fda19b13fc8a8dec3e5074f367e34fa82b40d28e'
-            '551add99a48c7c7863638967194c98e17a4e39bfc391da7b66094957d102dc57'
-            '8e9a6c70ab0ceb5d91b637dc290768f8a47edb5d7b6e2eebc4459dbc4ee040d7')
+sha256sums=('ed3f75837cb33cd694610fc87cd569c4782b7ac4e099143a3dbe8fff1f1c6a9d'
+            'ca1c7562e209d9ab791b02f2a886c61a9ed705a912d9575f590734eff21d6e5c')
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
-  # https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/211
-  patch -Np1 -i ../$pkgname-fix-ColorSettings-release.patch
-
   # Enable Adwaita theme and font hinting by default
   patch -Np1 -i "$srcdir/default-xsettings-xml.patch"
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
-    --disable-static \
     --enable-xrandr \
     --enable-xcursor \
     --enable-libnotify \
@@ -49,7 +43,7 @@
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 

Modified: default-xsettings-xml.patch
===================================================================
--- default-xsettings-xml.patch 2022-12-15 14:01:55 UTC (rev 464384)
+++ default-xsettings-xml.patch 2022-12-15 14:12:52 UTC (rev 464385)
@@ -8,7 +8,7 @@
 -    <property name="ThemeName" type="empty"/>
 -    <property name="IconThemeName" type="empty"/>
 +    <property name="ThemeName" type="string" value="Adwaita"/>
-+    <property name="IconThemeName" type="string" value="Adwaita"/>
++    <property name="IconThemeName" type="string" value="elementary"/>
      <property name="DoubleClickTime" type="int" value="400"/>
      <property name="DoubleClickDistance" type="int" value="5"/>
      <property name="DndDragThreshold" type="int" value="8"/>

Reply via email to