Changes - SailfishOS Open Build Service

Changes of Revision 9

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:ImageMagick.changes
@@ -1,3 +1,27 @@ +* Wed Nov 9 2022 Nephros <sailfish@nephros.org> - 7.1.0.52-1.0) +- version bump +- move source repo from gitlab to github (old repo is broken) + +* Sun Oct 30 2022 Nephros <sailfish@nephros.org> - 7.1.0.51-1.0) +- version bump + +* Mon Jul 18 2022 Nephros <sailfish@nephros.org> - 7.1.0.43-1.0 +- version bump + +* Tue Jun 21 2022 Nephros <sailfish@nephros.org> - 7.1.0.39-1.2 +- version bump +- add zstd + +* Tue Jun 21 2022 Nephros <sailfish@nephros.org> - 7.1.0.39-1.1 +- version bump +- add zstd + +* Tue Jun 21 2022 Nephros <sailfish@nephros.org> - 7.1.0.39-1.0 +- version bump + +* Tue May 24 2022 Nephros <sailfish@nephros.org> - 7.1.0.35-1.0 +- version bump + * Thu May 12 2022 Nephros <sailfish@nephros.org> - 7.1.0.33-1.1 - version bump
[-] [+]	Changed	_service:tar_git:ImageMagick.spec ^
@@ -7,17 +7,21 @@ # >> macros # << macros -%define mfr_revision 33 +%define mfr_revision 52 %define maj 7 %define mfr_version %{maj}.1.0 %define quantum_depth 16 %define clibver 10 %define libspec -%{maj}_Q%{quantum_depth}HDRI %define source_version %{mfr_version}-%{mfr_revision} +%define this_is_a_hack see_yaml_for_details +%if 0%{?sailfishos_version} >= 40400 +BuildRequires: pkgconfig(libzstd) +%endif Summary: Viewer and Converter for Images -Version: 7.1.0.33+obs1.0 -Release: 1.1 +Version: 7.1.0.52+obs1.0 +Release: 1.0 Group: Applications/Multimedia License: ImageMagick URL: https://imagemagick.org/ @@ -56,10 +60,10 @@ - Graphics - Utility - Library -Icon: https://gitlab.com/nephros/harbour-imagemagick/-/raw/obs/files/icon-imagemagick_sfos_256.png +Icon: https://github.com/nephros/harbour-imagemagick/raw/master/files/icon-imagemagick_sfos_256.png Custom: Repo: https://github.com/ImageMagick/ImageMagick - PackagingRepo: https://gitlab.com/nephros/harbour-imagemagick + PackagingRepo: https://github.com/nephros/harbour-imagemagick Url: Homepage: https://imagemagick.org/ Help: https://imagemagick.org/script/command-line-tools.php @@ -106,7 +110,7 @@ --without-openjp2 \ --without-raw \ --without-x \ - --without-zstd \ + --with-zstd \ CFLAGS="$RPM_OPT_FLAGS -fPIC -pie" \ CXXFLAGS="$RPM_OPT_FLAGS -fPIC -pie"
[-] [+]	Changed	_service ^
@@ -1,8 +1,13 @@ <services> <service name="tar_git"> + <!-- <param name="url">https://gitlab.com/nephros/harbour-imagemagick</param> + <param name="url">https://github.com/nephros/harbour-imagemagick.git</param> <param name="branch">obs</param> - <param name="revision">7.1.0.33+obs1.0</param> + <param name="revision"></param> + --> + <param name="url">https://github.com/nephros/harbour-imagemagick.git</param> + <param name="revision">7.1.0.52+obs1.0</param> <param name="debian">N</param> <param name="dumb">N</param> </service>
	Changed	_service:tar_git:ImageMagick-7.1.0.52+obs1.0.tar.xz ^
[-] [+]	Changed	_service:tar_git:ImageMagick.yaml ^
@@ -1,8 +1,8 @@ Name: ImageMagick ### DO NOT FORGET TO BUMP mfr_revision below !!! ### Also, the builds script needs this to not be a macro -Version: 7.1.0.33 -Release: 1.1 +Version: 7.1.0.52 +Release: 1.0 Summary: Viewer and Converter for Images Group: Applications/Multimedia License: ImageMagick @@ -12,13 +12,21 @@ - "%{name}-%{version}.tar.xz" Macros: #- 'debug_build;0' - - 'mfr_revision;33' + - 'mfr_revision;52' - 'maj;7' - 'mfr_version;%{maj}.1.0' - 'quantum_depth;16' - 'clibver;10' - 'libspec;-%{maj}_Q%{quantum_depth}HDRI' - 'source_version;%{mfr_version}-%{mfr_revision}' + # + # Hack: spectacle deletes macros, this works arount this: + # libzstd is only in 4.4: + - \| + this_is_a_hack; see_yaml_for_details + %if 0%{?sailfishos_version} >= 40400 + BuildRequires: pkgconfig(libzstd) + %endif #Requires: # - libfoo PkgBR: @@ -35,6 +43,7 @@ - libpng - libtiff-4 - libxml-2.0 + # libzstd # only in 4.4 - pango Description: \| ImageMagick® is a software suite to create, edit, compose, or convert @@ -53,10 +62,10 @@ - Graphics - Utility - Library - Icon: https://gitlab.com/nephros/harbour-imagemagick/-/raw/obs/files/icon-imagemagick_sfos_256.png + Icon: https://github.com/nephros/harbour-imagemagick/raw/master/files/icon-imagemagick_sfos_256.png Custom: Repo: https://github.com/ImageMagick/ImageMagick - PackagingRepo: https://gitlab.com/nephros/harbour-imagemagick + PackagingRepo: https://github.com/nephros/harbour-imagemagick Url: Homepage: https://imagemagick.org/ Help: https://imagemagick.org/script/command-line-tools.php @@ -86,7 +95,8 @@ # --without-pango - --without-raw - --without-x - - --without-zstd + # --without-zstd + - --with-zstd - CFLAGS="$RPM_OPT_FLAGS -fPIC -pie" - CXXFLAGS="$RPM_OPT_FLAGS -fPIC -pie"