diff --git a/community/appstream-glib/build b/community/appstream-glib/build index 59caf9f76..938b6855b 100755 --- a/community/appstream-glib/build +++ b/community/appstream-glib/build @@ -2,19 +2,16 @@ export DESTDIR="$1" -if ! patch --help 2>&1 | grep gnu; then - echo "Switch to gnu patch:" - echo "# kiss a patch /usr/bin/patch" - exit 1 -fi +for p in *.patch; do + patch -p1 < "$p" +done -patch -p1 < no-uuid.patch +# Don't build tests and po. +sed -e "/subdir('tests')/d" \ + -e "/subdir('po')/d" meson.build > _ +mv -f _ meson.build -# Don't build tests. -sed "/subdir('tests')/d" data/meson.build > _ -mv -f _ data/meson.build - -meson setup \ +muon setup \ -Dprefix=/usr \ -Dsysconfdir=/etc \ -Dmandir=/usr/share/man \ @@ -26,4 +23,4 @@ meson setup \ output ninja -C output -ninja -C output install +muon -C output install diff --git a/community/appstream-glib/checksums b/community/appstream-glib/checksums index 03d6e2e64..f19cf5f84 100644 --- a/community/appstream-glib/checksums +++ b/community/appstream-glib/checksums @@ -1,2 +1,3 @@ d9e33fdd4e6f4f382e64e291e9a228fde6655349409b2ef74b44a97f862e3e0d1a -8a289874ad91be7104298f85edb138a8d10735f6ce58f975f0077a29cda760fe57 +e721ba2ca369dca9ee91fadd5d7e4a06e10ba84fa1d23d9447e372c77df8cc877e +3964510c3dc0fc03861d7c49d5ed9755f63f9e34ba089d11acecdf315bf3d4063d diff --git a/community/appstream-glib/depends b/community/appstream-glib/depends index 23ac45a8b..c3d3a0a2a 100644 --- a/community/appstream-glib/depends +++ b/community/appstream-glib/depends @@ -1,10 +1,8 @@ +curl gdk-pixbuf glib gperf gtk+3 json-glib libarchive -libsoup -meson make -patch make -samurai make +muon make diff --git a/community/appstream-glib/esources b/community/appstream-glib/esources index aece3ed75..0fc891693 100644 --- a/community/appstream-glib/esources +++ b/community/appstream-glib/esources @@ -1,2 +1,3 @@ https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-VERSION.tar.xz patches/no-uuid.patch +patches/muon.patch diff --git a/community/appstream-glib/patches/muon.patch b/community/appstream-glib/patches/muon.patch new file mode 100644 index 000000000..16b4f52c2 --- /dev/null +++ b/community/appstream-glib/patches/muon.patch @@ -0,0 +1,41 @@ +diff --git a/libappstream-glib/meson.build b/libappstream-glib/meson.build +index c124532..8acc2fa 100644 +--- a/libappstream-glib/meson.build ++++ b/libappstream-glib/meson.build +@@ -31,9 +31,33 @@ if get_option('stemmer') + deps += stemmer + endif + +-asresources = gnome.compile_resources( +- 'as-resources', 'appstream-glib.gresource.xml', +- c_name : 'as' ++asresources = [] ++asresources += custom_target('asresources_c', ++ output: 'as-resources.c', ++ input: files('appstream-glib.gresource.xml'), ++ command: [ ++ find_program('glib-compile-resources'), ++ '@INPUT@', ++ '--sourcedir=' + meson.current_source_dir(), ++ '--c-name=as', ++ '--internal', ++ '--generate', ++ '--target=@OUTPUT@', ++ ], ++) ++ ++asresources += custom_target('asresources_h', ++ output: 'as-resources.h', ++ input: files('appstream-glib.gresource.xml'), ++ command: [ ++ find_program('glib-compile-resources'), ++ '@INPUT@', ++ '--sourcedir=' + meson.current_source_dir(), ++ '--c-name=as', ++ '--internal', ++ '--generate', ++ '--target=@OUTPUT@', ++ ], + ) + + configure_file( diff --git a/community/appstream-glib/patches/no-uuid.patch b/community/appstream-glib/patches/no-uuid.patch index 5aa07ab1c..3400e4076 100644 --- a/community/appstream-glib/patches/no-uuid.patch +++ b/community/appstream-glib/patches/no-uuid.patch @@ -12,12 +12,12 @@ index 872d30d..60abcf6 100644 Libs: -L${libdir} -lappstream-glib Cflags: -I${includedir}/libappstream-glib diff --git a/libappstream-glib/as-utils.c b/libappstream-glib/as-utils.c -index 007a86b..35fd9d0 100644 +index d9b0f56..301a632 100644 --- a/libappstream-glib/as-utils.c +++ b/libappstream-glib/as-utils.c -@@ -23,13 +23,6 @@ +@@ -22,13 +22,6 @@ + #include #include - #include #include -#ifndef _WIN32 -#ifdef __APPLE__ @@ -29,7 +29,7 @@ index 007a86b..35fd9d0 100644 #ifdef HAVE_RPM #include -@@ -1531,53 +1524,7 @@ as_utils_guid_from_data (const gchar *namespace_id, +@@ -1530,53 +1523,7 @@ as_utils_guid_from_data (const gchar *namespace_id, gsize data_len, GError **error) { @@ -83,7 +83,7 @@ index 007a86b..35fd9d0 100644 } /** -@@ -1593,20 +1540,7 @@ as_utils_guid_from_data (const gchar *namespace_id, +@@ -1592,20 +1539,7 @@ as_utils_guid_from_data (const gchar *namespace_id, gboolean as_utils_guid_is_valid (const gchar *guid) { @@ -105,7 +105,7 @@ index 007a86b..35fd9d0 100644 /** diff --git a/libappstream-glib/meson.build b/libappstream-glib/meson.build -index 715123d..f5beaae 100644 +index 886f6c6..c124532 100644 --- a/libappstream-glib/meson.build +++ b/libappstream-glib/meson.build @@ -16,7 +16,7 @@ if platform_win32 @@ -117,7 +117,7 @@ index 715123d..f5beaae 100644 endif if get_option('dep11') -@@ -158,9 +158,6 @@ pkg_req_private = [ +@@ -160,9 +160,6 @@ pkg_req_private = [ 'libarchive' ] @@ -128,14 +128,14 @@ index 715123d..f5beaae 100644 pkgg.generate( version : as_version, diff --git a/meson.build b/meson.build -index 331dd7a..5ca8750 100644 +index 45a1115..50de37b 100644 --- a/meson.build +++ b/meson.build -@@ -69,7 +69,6 @@ elif platform_osx +@@ -71,7 +71,6 @@ elif platform_osx giounix = dependency('gio-unix-2.0', version : glib_ver) else giounix = dependency('gio-unix-2.0', version : glib_ver) - uuid = dependency('uuid') endif libarchive = dependency('libarchive') - soup = dependency('libsoup-2.4', version : '>= 2.51.92') + libcurl = dependency('libcurl', version : '>= 7.56.0') diff --git a/community/appstream-glib/sources b/community/appstream-glib/sources index b50f653f3..ceb96abf3 100644 --- a/community/appstream-glib/sources +++ b/community/appstream-glib/sources @@ -1,2 +1,3 @@ https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.8.2.tar.xz patches/no-uuid.patch +patches/muon.patch