Mercurial > vanilla

changeset 1334:7d9327688dfa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
misc/shared-mime-info: upgrade to 2.1
author David Demelier <markand@malikania.fr>
date Thu, 02 Dec 2021 20:32:16 +0100
parents 3bcfccf4727e
children 7e62919ec1c2
files misc/shared-mime-info/shared-mime-info.sh misc/shared-mime-info/shared-mime-info.sha1
diffstat 2 files changed, 14 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/misc/shared-mime-info/shared-mime-info.sh	Thu Dec 02 20:31:42 2021 +0100
+++ b/misc/shared-mime-info/shared-mime-info.sh	Thu Dec 02 20:32:16 2021 +0100
@@ -16,13 +16,13 @@
 #
 
 PKGNAME=shared-mime-info
-PKGVERSION=1.10
+PKGVERSION=2.1
 PKGREVISION=1
 PKGLICENSE="GPL-2.0-only"
 PKGSUMMARY="mime database"
-PKGDOWNLOAD="http://freedesktop.org/~hadess/$PKGNAME-$PKGVERSION.tar.xz"
+PKGWWW="https://freedesktop.org/wiki/Software/shared-mime-info"
+PKGDOWNLOAD="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0ee50652091363ab0d17e335e5e74fbe/$PKGNAME-$PKGVERSION.tar.xz"
 PKGDEPENDS="glib libxml2"
-PKGOPTIONS="NLS"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
@@ -30,32 +30,25 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}
 : ${LIBS:=}
-: ${NLS:=yes}
-
-if [ "$NLS" = "yes" ]; then
-	PKGDEPENDS="gettext $PKGDEPENDS"
-	with_nls="--enable-nls"
-else
-	with_nls="--disable-nls"
-fi
 
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	tar -xvf $PKGNAME-$PKGVERSION.tar.xz
 	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
+	CXX="$CXX" \
+	CXXFLAGS="$CXXFLAGS" \
 	LDFLAGS="$LDFLAGS" \
-	LIBS="$LIBS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix= \
-		$with_nls
-	make
-	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
+	meson . output \
+		--prefix / \
+		--buildtype release \
+		--default-library shared
+	meson compile -C output #ninja -C output
+	DESTDIR=$DESTDIR ninja -C output install
+	sed -i -e "s|prefix=/|prefix=|" $DESTDIR/lib/pkgconfig/*.pc
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/misc/shared-mime-info/shared-mime-info.sha1	Thu Dec 02 20:31:42 2021 +0100
+++ b/misc/shared-mime-info/shared-mime-info.sha1	Thu Dec 02 20:32:16 2021 +0100
@@ -1,1 +1,1 @@
-d126fa5a0b16bb5440c6b4c56bf65f83c189e129  shared-mime-info-1.10.tar.xz
+a251ffcc61de487d123407d414e5f83ae19d055d  shared-mime-info-2.1.tar.xz