[-]
[+]
|
Changed |
_service:tar_git:ImageMagick.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:ImageMagick.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://gitlab.com/nephros/harbour-imagemagick</param>
<param name="branch">obs</param>
- <param name="revision">7.1.0.19+obs1.2</param>
+ <param name="revision">7.1.0.27+obs1.2</param>
<param name="debian">N</param>
<param name="dumb">N</param>
</service>
|
|
Changed |
_service:tar_git:ImageMagick-7.1.0.27+obs1.2.tar.xz
^
|
[-]
[+]
|
Changed |
_service:tar_git:ImageMagick.yaml
^
|
@@ -1,7 +1,7 @@
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.19
+Version: 7.1.0.27
Release: 1.2
Summary: Viewer and Converter for Images
Group: Applications/Multimedia
@@ -12,38 +12,33 @@
- "%{name}-%{version}.tar.xz"
Macros:
#- 'debug_build;0'
- - 'mfr_revision;19'
+ - 'mfr_revision;27'
- 'maj;7'
- 'mfr_version;%{maj}.1.0'
- 'quantum_depth;16'
- 'clibver;10'
- 'libspec;-%{maj}_Q%{quantum_depth}HDRI'
- 'source_version;%{mfr_version}-%{mfr_revision}'
-
+#Requires:
+# - libfoo
PkgBR:
+ - autoconf
+ - automake
- gcc
- bzip2-devel
+ - harfbuzz-devel
- libjpeg-turbo-devel
- libtool-ltdl-devel
- libwebp-devel
PkgConfigBR:
- - libpng
- - libtiff-4
- liblzma
-Requires:
- - libgcc
- - libgomp
- - bzip2-libs
- - libjpeg-turbo
- libpng
- - libstdc++
- - libtiff
- - libwebp
- - xz-libs
-
+ - libtiff-4
+ - libxml-2.0
+ - pango
Description: |
ImageMagick® is a software suite to create, edit, compose, or convert
- bitmap images.
+ bitmap images.
It can read and write images in a variety of formats (over 200) including
PNG, JPEG, GIF, HEIC, TIFF, DPX, EXR, WebP, Postscript, PDF, and SVG.
ImageMagick can resize, flip, mirror, rotate, distort, shear and transform
@@ -56,15 +51,19 @@
Type: console-application
Categories:
- Graphics
- - Libraries
+ - Utility
+ - Library
+ Icon: https://gitlab.com/nephros/harbour-imagemagick/-/raw/obs/files/icon-imagemagick_sfos_256.png
Custom:
+ Repo: https://github.com/ImageMagick/ImageMagick
PackagingRepo: https://gitlab.com/nephros/harbour-imagemagick
- Icon: https://gitlab.com/nephros/harbour-imagemagick/-/raw/obs/files/icon-imagemagick_sfos_256.png
-
+ Url:
+ Homepage: https://imagemagick.org/
+ Help: https://imagemagick.org/script/command-line-tools.php
%endif
ConfigOptions:
- - --quiet
+ # --quiet
- --enable-silent-rules
- --enable-shared
- --disable-docs
@@ -84,62 +83,36 @@
- --without-lqr
- --without-openexr
- --without-openjp2
- - --without-pango
+ # --without-pango
- --without-raw
- --without-x
- --without-zstd
+ - CFLAGS="$RPM_OPT_FLAGS -fPIC -pie"
+ - CXXFLAGS="$RPM_OPT_FLAGS -fPIC -pie"
+
+ # from: https://fedoraproject.org/wiki/Changes/Harden_All_Packages
+ #
+ # CFLAGS="$RPM_OPT_FLAGS -fPIC -pie"
+ # CXXFLAGS="$RPM_OPT_FLAGS -fPIC -pie"
+ #
+ # export CFLAGS
+ # export CXXFLAGS
+ # 3c. Enable only -z now manually for your package:
+ #
+ # CFLAGS="$RPM_OPT_FLAGS -Wl,-z,relro -Wl,-z,now"
+ # CXXFLAGS="$RPM_OPT_FLAGS -Wl,-z,relro -Wl,-z,now"
+ #
+ # export CFLAGS
+ # export CXXFLAGS
+ # 3d. Enable 3b and 3c above manually for your package:
+ #
+ # CFLAGS="$RPM_OPT_FLAGS -fPIC -pie -Wl,-z,relro -Wl,-z,now"
+ # CXXFLAGS="$RPM_OPT_FLAGS -fPIC -pie -Wl,-z,relro -Wl,-z,now"
+ #
+ # export CFLAGS
+ # export CXXFLAGS
Builder: "none"
SetupOptions: '-q -n %{name}-%{version}/upstream'
-
-Files:
- - '%license LICENSE'
- - '%dir %{_sysconfdir}/ImageMagick-%{maj}'
- - '%config %{_sysconfdir}/ImageMagick-%{maj}/colors.xml'
- - '%config %{_sysconfdir}/ImageMagick-%{maj}/delegates.xml'
- - '%config %{_sysconfdir}/ImageMagick-%{maj}/log.xml'
- - '%config %{_sysconfdir}/ImageMagick-%{maj}/mime.xml'
- - '%config %{_sysconfdir}/ImageMagick-%{maj}/policy.xml'
- - '%config %{_sysconfdir}/ImageMagick-%{maj}/quantization-table.xml'
- - '%config %{_sysconfdir}/ImageMagick-%{maj}/thresholds.xml'
- - '%config %{_sysconfdir}/ImageMagick-%{maj}/type-apple.xml'
- - '%config %{_sysconfdir}/ImageMagick-%{maj}/type-dejavu.xml'
- - '%config %{_sysconfdir}/ImageMagick-%{maj}/type-ghostscript.xml'
- - '%config %{_sysconfdir}/ImageMagick-%{maj}/type-urw-base35.xml'
- - '%config %{_sysconfdir}/ImageMagick-%{maj}/type-windows.xml'
- - '%config %{_sysconfdir}/ImageMagick-%{maj}/type.xml'
- - '%{_usr}/share/ImageMagick-%{maj}/francais.xml'
- - '%{_usr}/share/ImageMagick-%{maj}/english.xml'
- - '%{_usr}/share/ImageMagick-%{maj}/locale.xml'
- - '%{_bindir}/[^MW]*'
- - '%{_libdir}/libMagickCore*.so.%{clibver}*'
- - '%{_libdir}/libMagickWand*.so.%{clibver}*'
- - '%dir %{_libdir}/ImageMagick*'
- - '%{_libdir}/ImageMagick*/config*'
- - '%{_libdir}/ImageMagick*/modules*'
-
AutoSubPackages:
- - devel
-# - debuginfo
-# - debugsource
-# Summary: Development files for ImageMagick
-# Description: Development files for ImageMagick
-# Group: Development/Libraries
-# Requires:
-# - 'ImageMagick = %{version}'
-# - 'glibc-devel'
-# Files:
-# - '%doc ChangeLog NEWS.txt'
-# - '%{_libdir}/libMagickCore*.so'
-# - '%{_libdir}/libMagickWand*.so'
-# - '%{_libdir}/libMagickCore*.la'
-# - '%{_libdir}/libMagickWand*.la'
-# - '%dir %{_includedir}/ImageMagick*'
-# - '%{_includedir}/ImageMagick*/MagickCore'
-# - '%{_includedir}/ImageMagick*/MagickWand'
-# - '%{_bindir}/MagickCore-config'
-# - '%{_bindir}/MagickWand-config'
-# - '%{_libdir}/pkgconfig/MagickCore*.pc'
-# - '%{_libdir}/pkgconfig/ImageMagick*.pc'
-# - '%{_libdir}/pkgconfig/MagickWand*.pc'
-
+ - devel
|