diff --git a/.gitignore b/.gitignore index 37536f0..98cbc67 100644 --- a/.gitignore +++ b/.gitignore @@ -198,3 +198,4 @@ gnome-desktop-2.90.4.tar.bz2 /gnome-desktop-44.beta.tar.xz /gnome-desktop-44.0.tar.xz /gnome-desktop-44.1.tar.xz +/qrcodegen.tar.gz diff --git a/QR-Code-generator.tar.gz b/QR-Code-generator.tar.gz deleted file mode 100644 index c58783a..0000000 Binary files a/QR-Code-generator.tar.gz and /dev/null differ diff --git a/gnome-desktop3.spec b/gnome-desktop3.spec index 6c72e74..e17118b 100644 --- a/gnome-desktop3.spec +++ b/gnome-desktop3.spec @@ -29,7 +29,7 @@ Source4: loupe-defaults.list # Generated with: # for i in `grep MimeType= /usr/share/applications/org.gnome.Evince.desktop | sed 's/MimeType=//' | sed 's/;/ /g'` ; do echo $i=org.gnome.Evince.desktop\; >> evince-defaults.list ; done Source5: evince-defaults.list -Source6: QR-Code-generator.tar.gz +Source6: qrcodegen.tar.gz Patch: 0001-Add-gnome-qr-library.patch @@ -120,11 +120,10 @@ the functionality of the installed %{name} package. %prep %autosetup -p1 -n gnome-desktop-%{tarball_version} -# Extract QR Code generator subproject manually (wrap-based subproject sources -# are not included in git patches, only in release tarballs) -mkdir -p subprojects/qrcodegen -tar -xzf %{SOURCE6} -C subprojects/qrcodegen --strip-components=1 -cp -r subprojects/packagefiles/qrcodegen/* subprojects/qrcodegen/ +# Extract qrcodegen and set it up as a subproject +# since wrap-based subprojects are disabled +mkdir -p subprojects +tar xf %{SOURCE6} -C subprojects/ %build %meson -Dgtk_doc=true -Dinstalled_tests=true diff --git a/sources b/sources index 8df4bbd..4870c25 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (gnome-desktop-44.1.tar.xz) = a939793a6870693f132cabb6dd5f06d0f2744cf97a9dc4b7a2b04c9a5aa09aa56f2f6d7630199a42d0d4e539ae724b54b91d4f9fe9ea2f785d854c58b2d8dd5f +SHA512 (qrcodegen.tar.gz) = fa85c79c3543dc3b3b9102efe4c8198a18910832562d5f9a516b0e8624088f1a072963e6ceada3469ff755b83d631ff4362dfd903ea4c315f9df6c2176e9eafe