Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / 
xfce4-settings


Commits:
81a99da1 by Robin Candau at 2024-09-15T22:45:40+02:00
upgpkg: 4.18.6-2 Overall rework of the PKGBUILD

Context: https://archlinux.org/todo/general-xfce-packages-rework/

- Use SPDX identifier for the license
- Switch to a more transparent source (git sources)
- Add missing optional dependencies
- Add nvchecker integration (.nvchecker.toml)

Fixes 
https://gitlab.archlinux.org/archlinux/packaging/packages/xfce4-settings/-/issues/1

- - - - -


3 changed files:

- .SRCINFO
- + .nvchecker.toml
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,12 +1,15 @@
 pkgbase = xfce4-settings
        pkgdesc = Xfce's Configuration System
        pkgver = 4.18.6
-       pkgrel = 1
+       pkgrel = 2
        url = https://docs.xfce.org/xfce/xfce4-settings/start
        arch = x86_64
        groups = xfce4
-       license = GPL2
+       license = GPL-2.0-or-later
+       makedepends = git
+       makedepends = glib2-devel
        makedepends = intltool
+       makedepends = xfce4-dev-tools
        makedepends = xf86-input-libinput
        depends = exo
        depends = garcon
@@ -19,9 +22,12 @@ pkgbase = xfce4-settings
        depends = elementary-icon-theme
        depends = gnome-themes-extra
        optdepends = python: xfce4-compose-mail -- "mailto:"; URI handling
-       source = 
https://archive.xfce.org/src/xfce/xfce4-settings/4.18/xfce4-settings-4.18.6.tar.bz2
+       optdepends = xiccd: for displays support in xfce4-color-settings
+       optdepends = cupsd: for printers support in xfce4-color-settings
+       optdepends = saned: for scanners support in xfce4-color-settings
+       source = 
git+https://gitlab.xfce.org/xfce/xfce4-settings.git#tag=xfce4-settings-4.18.6
        source = default-xsettings-xml.patch
-       sha256sums = 
d9a9051b6026edd6766c64bb403b51e9167e4d31e7f1c7f843d3aed19f667bfe
+       sha256sums = 
f7908fa2dd5b8cde014f5c0f750d8c6e7edea8e5e7c6eac215a767314d66c7e0
        sha256sums = 
ca1c7562e209d9ab791b02f2a886c61a9ed705a912d9575f590734eff21d6e5c
 
 pkgname = xfce4-settings


=====================================
.nvchecker.toml
=====================================
@@ -0,0 +1,5 @@
+[xfce4-settings]
+source = "git"
+git = "https://gitlab.xfce.org/xfce/xfce4-settings.git";
+prefix = "xfce4-settings-"
+exclude_regex = 'xfce4-settings-4\.[12][13579]\.[0-9]+'


=====================================
PKGBUILD
=====================================
@@ -1,34 +1,34 @@
 # Maintainer: Evangelos Foutras <foutre...@archlinux.org>
+# Maintainer: Robin Candau <an...@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Corrado Primier <ba...@aur.archlinux.org>
 
 pkgname=xfce4-settings
 pkgver=4.18.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Xfce's Configuration System"
 arch=('x86_64')
 url="https://docs.xfce.org/xfce/xfce4-settings/start";
-license=('GPL2')
+license=('GPL-2.0-or-later')
 groups=('xfce4')
 depends=('exo' 'garcon' 'libxfce4ui' 'xfconf' 'libnotify' 'libcanberra'
          '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
+makedepends=('git' 'glib2-devel' 'intltool' 'xfce4-dev-tools' 
'xf86-input-libinput')
+optdepends=('python: xfce4-compose-mail -- "mailto:"; URI handling'
+            'xiccd: for displays support in xfce4-color-settings'
+            'cupsd: for printers support in xfce4-color-settings'
+            'saned: for scanners support in xfce4-color-settings')
+source=("git+https://gitlab.xfce.org/xfce/xfce4-settings.git#tag=$pkgname-$pkgver";
         default-xsettings-xml.patch)
-sha256sums=('d9a9051b6026edd6766c64bb403b51e9167e4d31e7f1c7f843d3aed19f667bfe'
+sha256sums=('f7908fa2dd5b8cde014f5c0f750d8c6e7edea8e5e7c6eac215a767314d66c7e0'
             'ca1c7562e209d9ab791b02f2a886c61a9ed705a912d9575f590734eff21d6e5c')
 prepare() {
-  cd $pkgname-$pkgver
+  cd $pkgname
 
   # Enable Adwaita theme, elementary icon theme and font hinting by default
   patch -Np1 -i "$srcdir/default-xsettings-xml.patch"
-}
-
-build() {
-  cd $pkgname-$pkgver
 
-  ./configure \
+  ./autogen.sh \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
@@ -39,11 +39,15 @@ build() {
     --enable-pluggable-dialogs \
     --enable-sound-settings \
     --disable-debug
+}
+
+build() {
+  cd $pkgname
   make
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="$pkgdir" install
 }
 



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/xfce4-settings/-/commit/81a99da17554d6562dcf4e8b17444678479b5b97

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/xfce4-settings/-/commit/81a99da17554d6562dcf4e8b17444678479b5b97
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to