aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2021-01-26 12:19:05 +0100
committerBart Ribbers <bribbers@disroot.org>2021-01-26 12:20:07 +0100
commitcab34fa5966af24a87d90c8665c9b366bc26aba3 (patch)
tree25c7b59e1e5494c3fc8cabdf8a2f7ad4dfde2d75
parent5a45822a319a7c0af5dbfe5da1f1a714aefe6221 (diff)
downloadaports-cab34fa5966af24a87d90c8665c9b366bc26aba3.tar.gz
aports-cab34fa5966af24a87d90c8665c9b366bc26aba3.tar.bz2
aports-cab34fa5966af24a87d90c8665c9b366bc26aba3.tar.xz
testing/libresource: upgrade to 0.24.0
-rw-r--r--testing/libresource/APKBUILD26
-rw-r--r--testing/libresource/fix-pkgconfig-version.patch53
2 files changed, 19 insertions, 60 deletions
diff --git a/testing/libresource/APKBUILD b/testing/libresource/APKBUILD
index 504be22f0c..d88eb86af5 100644
--- a/testing/libresource/APKBUILD
+++ b/testing/libresource/APKBUILD
@@ -1,23 +1,35 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=libresource
-pkgver=0.23.2
+pkgver=0.24.0
pkgrel=0
+_commit_dbusgmain="d42176ae4763e5288ef37ea314fe58387faf2005"
pkgdesc="Nemo's libresource"
url="https://git.sailfishos.org/mer-core/libresource"
arch="all"
-license="LGPL-2.1-only"
-depends_dev="dbus-dev dbus-glib-dev check-dev"
-makedepends="$depends_dev automake autoconf libtool"
+license="LGPL-2.1-only AND (AFL-2.1 OR GPL-2.0-or-later)"
+depends_dev="
+ check-dev
+ dbus-dev
+ dbus-glib-dev
+ "
+makedepends="$depends_dev
+ autoconf
+ automake
+ libtool
+ "
subpackages="$pkgname-static $pkgname-dev"
source="https://git.sailfishos.org/mer-core/libresource/-/archive/$pkgver/libresource-$pkgver.tar.gz
- fix-pkgconfig-version.patch
+ https://github.com/sailfishos-mirror/dbus-glib/archive/$_commit_dbusgmain/dbus-glib-$_commit_dbusgmain.tar.gz
"
options="!check" # No suitable tests
prepare() {
default_prepare
+ rmdir dbus-gmain
+ mv "$srcdir/dbus-glib-$_commit_dbusgmain" dbus-gmain
+
echo "$pkgver" > .tarball-version
./autogen.sh
}
@@ -35,5 +47,5 @@ package() {
rm -rf "$pkgdir"/opt
}
-sha512sums="c185d8a3e509004a9905ed02fb914a8ffcb45a68f9ccfe40ef4b6a19597877c23c7e3887b6df1b4269f080fede13265a22166060568e763b18947f509145ac19 libresource-0.23.2.tar.gz
-66fde0af9185b3e1f484db34040bb0929b6da1e89df050a99570286b194d12a42acd5dbf76fc5e1ba6fa8201640fff4d58098d23515152b366963f2b16761fa7 fix-pkgconfig-version.patch"
+sha512sums="22b98bfac5099cc8e47498c582acf7ed01594a96d27e949de2c8a42323f434f92e5d577ef40aa46a368d1162bbce3ca5b0f1cadfad2891254025b2934047a536 libresource-0.24.0.tar.gz
+665cd6395ee0ea14086ba30188c62a72697b3f63484681e18fc7f54109c9aca162f2e33aa2fa4d45287c6c0b590e81ca310c143dac0232cd5887692cdaf51256 dbus-glib-d42176ae4763e5288ef37ea314fe58387faf2005.tar.gz"
diff --git a/testing/libresource/fix-pkgconfig-version.patch b/testing/libresource/fix-pkgconfig-version.patch
deleted file mode 100644
index 72594f6b77..0000000000
--- a/testing/libresource/fix-pkgconfig-version.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Upstream merge-request: https://git.sailfishos.org/mer-core/libresource/merge_requests/5
-
-From 5d4625173c64dec352548f262159da33d8030b1a Mon Sep 17 00:00:00 2001
-From: Bart Ribbers <bribbers@disroot.org>
-Date: Wed, 25 Mar 2020 13:49:33 +0100
-Subject: [PATCH] Never run git commands when .tarball-version exists
-
-This makes it work in environments where the building takes place in a
-git repo, but libresource is still built from a release tarball
----
- build-aux/git-version-gen | 25 ++++++++++++++-----------
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
-index 819fa04..7769787 100755
---- a/build-aux/git-version-gen
-+++ b/build-aux/git-version-gen
-@@ -129,18 +129,21 @@ fi
-
- v=`echo "$v" |sed 's/^v//'`
-
--# Don't declare a version "dirty" merely because a time stamp has changed.
--git status > /dev/null 2>&1
-+if [ ! -f $tarball_version_file ]
-+then
-+ # Don't declare a version "dirty" merely because a time stamp has changed.
-+ git status > /dev/null 2>&1
-
--dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
--case "$dirty" in
-- '') ;;
-- *) # Append the suffix only if there isn't one already.
-- case $v in
-- *-dirty) ;;
-- *) v="$v-dirty" ;;
-- esac ;;
--esac
-+ dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
-+ case "$dirty" in
-+ '') ;;
-+ *) # Append the suffix only if there isn't one already.
-+ case $v in
-+ *-dirty) ;;
-+ *) v="$v-dirty" ;;
-+ esac ;;
-+ esac
-+fi
-
- # We default to 0.0.0 instead of UNKNOWN
- if test "x$v" = "xUNKNOWN"; then
---
-2.23.0
-