commit php7-gmagick for openSUSE:Factory
Hello community,
here is the log from the commit of package php7-gmagick for openSUSE:Factory
checked in at 2020-01-04 19:22:04
Comparing /work/SRC/openSUSE:Factory/php7-gmagick (Old)
and /work/SRC/openSUSE:Factory/.php7-gmagick.new.6675 (New)
Package is "php7-gmagick"
Sat Jan 4 19:22:04 2020 rev:8 rq:760807 version:2.0.5RC1
Changes:
--- /work/SRC/openSUSE:Factory/php7-gmagick/php7-gmagick.changes
2019-12-29 15:50:21.051194113 +0100
+++ /work/SRC/openSUSE:Factory/.php7-gmagick.new.6675/php7-gmagick.changes
2020-01-04 19:22:05.749157297 +0100
@@ -1,0 +2,14 @@
+Sat Jan 4 12:16:04 UTC 2020 - Илья Индиго
+
+- Refresh spec-file.
+
+---
+Sat Jan 4 11:16:08 UTC 2020 - Arjen de Korte
+
+- Segfaults on shutdown need to be mitigated when GraphicsMagick is
+ compiled with OpenMP support and PHP >= 7.4 only. For GCC < 9,
+ the only option is to run in single thread mode, for GCC >= 9
+ wait until OpenMP has relinquished its resources (modified
+ fix-segfault-on-shutdown.patch).
+
+---
Other differences:
--
++ php7-gmagick.spec ++
--- /var/tmp/diff_new_pack.tQjHNa/_old 2020-01-04 19:22:06.769157749 +0100
+++ /var/tmp/diff_new_pack.tQjHNa/_new 2020-01-04 19:22:06.769157749 +0100
@@ -1,7 +1,7 @@
#
# spec file for package php7-gmagick
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,8 +29,8 @@
Source1:%{pkg_name}.ini
# PATCH-FIX-UPSTREAM fix-segfault-on-shutdown.patch
https://bugs.php.net/bug.php?id=78465
Patch0: fix-segfault-on-shutdown.patch
-BuildRequires: %{php_name}-devel >= 7.0.1
-BuildRequires: GraphicsMagick-devel >= 1.3.17
+BuildRequires: %{php_name}-devel
+BuildRequires: GraphicsMagick-devel
BuildRequires: ghostscript-fonts-std
BuildRequires: re2c
Conflicts: php7-imagick
@@ -50,26 +50,25 @@
%prep
%setup -q -n %{pkg_name}-%{version}
%patch0
-mkdir %{name}
%build
+export CFLAGS="%{optflags} -fvisibility=hidden %(GraphicsMagick-config
--cflags)"
%{_bindir}/phpize
-export CFLAGS="%{optflags} -fvisibility=hidden"
-%configure --with-%{pkg_name}=%{_usr}
-make %{?_smp_mflags}
+%configure
+%make_build
%check
-make %{?_smp_mflags} PHP_EXECUTABLE=%{__php} NO_INTERACTION=1 test
+%make_build PHP_EXECUTABLE=%{__php} NO_INTERACTION=1 test
%install
-make DESTDIR=%{buildroot} install INSTALL_ROOT=%{buildroot}
+%make_install INSTALL_ROOT=%{buildroot}
mkdir -p %{buildroot}%{_sysconfdir}/%{php_name}/conf.d
-install --mode=0644 %{SOURCE1}
%{buildroot}%{_sysconfdir}/%{php_name}/conf.d/%{pkg_name}.ini
+install -m644 %{SOURCE1}
%{buildroot}%{_sysconfdir}/%{php_name}/conf.d/%{pkg_name}.ini
%files
-%{_libdir}/%{php_name}/extensions/%{pkg_name}.so
%config(noreplace) %{_sysconfdir}/%{php_name}/conf.d/%{pkg_name}.ini
%license LICENSE
%doc CONTRIBUTORS.md README.md
+%{_libdir}/%{php_name}/extensions/%{pkg_name}.so
%changelog
++ fix-segfault-on-shutdown.patch ++
--- /var/tmp/diff_new_pack.tQjHNa/_old 2020-01-04 19:22:06.785157756 +0100
+++ /var/tmp/diff_new_pack.tQjHNa/_new 2020-01-04 19:22:06.785157756 +0100
@@ -1,16 +1,46 @@
There seems to be a problem when the program is terminating if GraphicsMagick
has been compiled
-with OpenMP support and has used more than one thread. It often segfaults in
that case.
+with OpenMP support and has used more than one thread. It often segfaults with
PHP >= 7.4.
+
+The solution seems to be to explicitly let OpenMP relinquish its resources
before terminating.
+This is only possible on GCC >= 9, as this function was not available before.
On GCC < 9 the
+alternative is to run in single thread mode.
+
+Whether or not GraphicsMagick was compiled with OpenMP support, can be
deterimined by adding
+the output of `GraphicsMagick-config --cflags` to the CFLAGS, which will
define _OPENMP in
+that case.
See https://bugs.php.net/bug.php?id=78465 and
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91256
--- gmagick.c
+++ gmagick.c
-@@ -1709,6 +1709,9 @@
+@@ -21,6 +21,10 @@
+ #include "php_gmagick_macros.h"
+ #include "php_gmagick_helpers.h"
+
++#if defined(_OPENMP) && (PHP_VERSION_ID >= 70400) && (__GNUC__ >= 9)
++#include
++#endif
++
+ /* handlers */
+ static zend_object_handlers gmagick_object_handlers;
+ static zend_object_handlers gmagickdraw_object_handlers;
+@@ -1709,6 +1713,9 @@ PHP_MINIT_FUNCTION(gmagick)
return FAILURE;
InitializeMagick(cwd);
-+#if PHP_VERSION_ID >= 70400
++#if defined(_OPENMP) &&
commit php7-gmagick for openSUSE:Factory
Hello community,
here is the log from the commit of package php7-gmagick for openSUSE:Factory
checked in at 2019-12-29 15:50:01
Comparing /work/SRC/openSUSE:Factory/php7-gmagick (Old)
and /work/SRC/openSUSE:Factory/.php7-gmagick.new.6675 (New)
Package is "php7-gmagick"
Sun Dec 29 15:50:01 2019 rev:7 rq:759828 version:2.0.5RC1
Changes:
--- /work/SRC/openSUSE:Factory/php7-gmagick/php7-gmagick.changes
2018-05-15 10:34:03.466743022 +0200
+++ /work/SRC/openSUSE:Factory/.php7-gmagick.new.6675/php7-gmagick.changes
2019-12-29 15:50:21.051194113 +0100
@@ -1,0 +2,6 @@
+Sat Dec 28 21:07:31 UTC 2019 - Arjen de Korte
+
+- Run in single thread mode by default to prevent a segfault on
+ shutdown in PHP 7.4 (fix-segfault-on-shutdown.patch)
+
+---
New:
fix-segfault-on-shutdown.patch
Other differences:
--
++ php7-gmagick.spec ++
--- /var/tmp/diff_new_pack.32uwq3/_old 2019-12-29 15:50:21.539194336 +0100
+++ /var/tmp/diff_new_pack.32uwq3/_new 2019-12-29 15:50:21.539194336 +0100
@@ -1,7 +1,7 @@
#
# spec file for package php7-gmagick
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -27,6 +27,8 @@
URL:https://pecl.php.net/package/gmagick
Source0:https://pecl.php.net/get/%{pkg_name}-%{version}.tgz
Source1:%{pkg_name}.ini
+# PATCH-FIX-UPSTREAM fix-segfault-on-shutdown.patch
https://bugs.php.net/bug.php?id=78465
+Patch0: fix-segfault-on-shutdown.patch
BuildRequires: %{php_name}-devel >= 7.0.1
BuildRequires: GraphicsMagick-devel >= 1.3.17
BuildRequires: ghostscript-fonts-std
@@ -47,6 +49,7 @@
%prep
%setup -q -n %{pkg_name}-%{version}
+%patch0
mkdir %{name}
%build
++ fix-segfault-on-shutdown.patch ++
There seems to be a problem when the program is terminating if GraphicsMagick
has been compiled
with OpenMP support and has used more than one thread. It often segfaults in
that case.
See https://bugs.php.net/bug.php?id=78465 and
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91256
--- gmagick.c
+++ gmagick.c
@@ -1709,6 +1709,9 @@
return FAILURE;
InitializeMagick(cwd);
+#if PHP_VERSION_ID >= 70400
+ SetMagickResourceLimit(ThreadsResource, 1);
+#endif
efree(cwd);
/* init constants */
commit php7-gmagick for openSUSE:Factory
Hello community,
here is the log from the commit of package php7-gmagick for openSUSE:Factory
checked in at 2018-05-15 10:15:07
Comparing /work/SRC/openSUSE:Factory/php7-gmagick (Old)
and /work/SRC/openSUSE:Factory/.php7-gmagick.new (New)
Package is "php7-gmagick"
Tue May 15 10:15:07 2018 rev:6 rq:606918 version:2.0.5RC1
Changes:
--- /work/SRC/openSUSE:Factory/php7-gmagick/php7-gmagick.changes
2018-05-11 09:18:17.322485725 +0200
+++ /work/SRC/openSUSE:Factory/.php7-gmagick.new/php7-gmagick.changes
2018-05-15 10:34:03.466743022 +0200
@@ -1,0 +2,7 @@
+Mon May 14 06:40:13 UTC 2018 - jweberho...@weberhofer.at
+
+- Due to a packaging change in ghostscript the ghostscript-fonts-std
+ has to be included explicitly to successfully run the tests. Elsewise
+ the required helvetica-font is missing. Fix for bnc#1091930.
+
+---
Other differences:
--
++ php7-gmagick.spec ++
--- /var/tmp/diff_new_pack.YDFa2E/_old 2018-05-15 10:34:04.106719517 +0200
+++ /var/tmp/diff_new_pack.YDFa2E/_new 2018-05-15 10:34:04.114719223 +0200
@@ -12,9 +12,10 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%define php_namephp7
%define pkg_namegmagick
Name: %{php_name}-%{pkg_name}
@@ -28,7 +29,9 @@
Source1:%{pkg_name}.ini
BuildRequires: %{php_name}-devel >= 7.0.1
BuildRequires: GraphicsMagick-devel >= 1.3.17
+BuildRequires: ghostscript-fonts-std
BuildRequires: re2c
+Conflicts: php7-imagick
Provides: php-%{pkg_name} = %{version}
Obsoletes: php-%{pkg_name} < %{version}
%if %{?php_zend_api}0
@@ -37,7 +40,6 @@
%else
%requires_eq%{php_name}
%endif
-Conflicts: php7-imagick
%description
PHP extension to create, modify and obtain meta information of images using
@@ -49,10 +51,13 @@
%build
%{_bindir}/phpize
-export CFLAGS="%optflags -fvisibility=hidden"
+export CFLAGS="%{optflags} -fvisibility=hidden"
%configure --with-%{pkg_name}=%{_usr}
make %{?_smp_mflags}
+%check
+make %{?_smp_mflags} PHP_EXECUTABLE=%{__php} NO_INTERACTION=1 test
+
%install
make DESTDIR=%{buildroot} install INSTALL_ROOT=%{buildroot}
mkdir -p %{buildroot}%{_sysconfdir}/%{php_name}/conf.d
commit php7-gmagick for openSUSE:Factory
Hello community,
here is the log from the commit of package php7-gmagick for openSUSE:Factory
checked in at 2018-05-11 09:18:14
Comparing /work/SRC/openSUSE:Factory/php7-gmagick (Old)
and /work/SRC/openSUSE:Factory/.php7-gmagick.new (New)
Package is "php7-gmagick"
Fri May 11 09:18:14 2018 rev:5 rq:606241 version:2.0.5RC1
Changes:
--- /work/SRC/openSUSE:Factory/php7-gmagick/php7-gmagick.changes
2018-03-19 23:37:58.698218937 +0100
+++ /work/SRC/openSUSE:Factory/.php7-gmagick.new/php7-gmagick.changes
2018-05-11 09:18:17.322485725 +0200
@@ -1,0 +2,5 @@
+Thu May 10 15:23:14 UTC 2018 - i...@ilya.pp.ua
+
+- Disable tests, because test fail with php7 7.2.5. (bsc#1091930)
+
+---
Other differences:
--
++ php7-gmagick.spec ++
--- /var/tmp/diff_new_pack.RCe8cA/_old 2018-05-11 09:18:19.102421235 +0200
+++ /var/tmp/diff_new_pack.RCe8cA/_new 2018-05-11 09:18:19.110420945 +0200
@@ -12,10 +12,9 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org
#
-
%define php_namephp7
%define pkg_namegmagick
Name: %{php_name}-%{pkg_name}
@@ -24,7 +23,7 @@
Summary:Wrapper to the GraphicsMagick library
License:PHP-3.01
Group: Productivity/Networking/Web/Servers
-Url:https://pecl.php.net/package/gmagick
+URL:https://pecl.php.net/package/gmagick
Source0:https://pecl.php.net/get/%{pkg_name}-%{version}.tgz
Source1:%{pkg_name}.ini
BuildRequires: %{php_name}-devel >= 7.0.1
@@ -54,9 +53,6 @@
%configure --with-%{pkg_name}=%{_usr}
make %{?_smp_mflags}
-%check
-make %{?_smp_mflags} PHP_EXECUTABLE=%{__php} NO_INTERACTION=1 test
-
%install
make DESTDIR=%{buildroot} install INSTALL_ROOT=%{buildroot}
mkdir -p %{buildroot}%{_sysconfdir}/%{php_name}/conf.d
commit php7-gmagick for openSUSE:Factory
Hello community,
here is the log from the commit of package php7-gmagick for openSUSE:Factory
checked in at 2018-03-19 23:37:57
Comparing /work/SRC/openSUSE:Factory/php7-gmagick (Old)
and /work/SRC/openSUSE:Factory/.php7-gmagick.new (New)
Package is "php7-gmagick"
Mon Mar 19 23:37:57 2018 rev:4 rq:587903 version:2.0.5RC1
Changes:
--- /work/SRC/openSUSE:Factory/php7-gmagick/php7-gmagick.changes
2018-03-09 10:46:02.359881220 +0100
+++ /work/SRC/openSUSE:Factory/.php7-gmagick.new/php7-gmagick.changes
2018-03-19 23:37:58.698218937 +0100
@@ -1,0 +2,9 @@
+Fri Mar 16 13:35:22 UTC 2018 - crrodrig...@opensuse.org
+
+- Build extension with -fvisibility=hidden, to limit
+ chance of symbol collisions with other extensions or libraries
+ loaded in the same process.
+
+- This extenion conflicts with php7-imagick (boo#1085595)
+
+---
Other differences:
--
++ php7-gmagick.spec ++
--- /var/tmp/diff_new_pack.TFX7iw/_old 2018-03-19 23:37:59.546188347 +0100
+++ /var/tmp/diff_new_pack.TFX7iw/_new 2018-03-19 23:37:59.550188203 +0100
@@ -12,9 +12,10 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%define php_namephp7
%define pkg_namegmagick
Name: %{php_name}-%{pkg_name}
@@ -23,7 +24,7 @@
Summary:Wrapper to the GraphicsMagick library
License:PHP-3.01
Group: Productivity/Networking/Web/Servers
-URL:https://pecl.php.net/package/gmagick
+Url:https://pecl.php.net/package/gmagick
Source0:https://pecl.php.net/get/%{pkg_name}-%{version}.tgz
Source1:%{pkg_name}.ini
BuildRequires: %{php_name}-devel >= 7.0.1
@@ -37,6 +38,7 @@
%else
%requires_eq%{php_name}
%endif
+Conflicts: php7-imagick
%description
PHP extension to create, modify and obtain meta information of images using
@@ -48,6 +50,7 @@
%build
%{_bindir}/phpize
+export CFLAGS="%optflags -fvisibility=hidden"
%configure --with-%{pkg_name}=%{_usr}
make %{?_smp_mflags}
commit php7-gmagick for openSUSE:Factory
Hello community,
here is the log from the commit of package php7-gmagick for openSUSE:Factory
checked in at 2018-03-09 10:45:39
Comparing /work/SRC/openSUSE:Factory/php7-gmagick (Old)
and /work/SRC/openSUSE:Factory/.php7-gmagick.new (New)
Package is "php7-gmagick"
Fri Mar 9 10:45:39 2018 rev:3 rq:584396 version:2.0.5RC1
Changes:
--- /work/SRC/openSUSE:Factory/php7-gmagick/php7-gmagick.changes
2018-01-06 18:48:42.908560823 +0100
+++ /work/SRC/openSUSE:Factory/.php7-gmagick.new/php7-gmagick.changes
2018-03-09 10:46:02.359881220 +0100
@@ -1,0 +2,6 @@
+Thu Mar 8 11:26:34 UTC 2018 - i...@ilya.pp.ua
+
+- Remove %configure/make duplicates.
+- Add %licence macros.
+
+---
Other differences:
--
++ php7-gmagick.spec ++
--- /var/tmp/diff_new_pack.pv3WMr/_old 2018-03-09 10:46:02.951859897 +0100
+++ /var/tmp/diff_new_pack.pv3WMr/_new 2018-03-09 10:46:02.955859754 +0100
@@ -51,10 +51,6 @@
%configure --with-%{pkg_name}=%{_usr}
make %{?_smp_mflags}
-%{__phpize}
-%configure --with-%{pkg_name}
-make %{?_smp_mflags}
-
%check
make %{?_smp_mflags} PHP_EXECUTABLE=%{__php} NO_INTERACTION=1 test
@@ -66,6 +62,7 @@
%files
%{_libdir}/%{php_name}/extensions/%{pkg_name}.so
%config(noreplace) %{_sysconfdir}/%{php_name}/conf.d/%{pkg_name}.ini
-%doc CONTRIBUTORS.md LICENSE README.md
+%license LICENSE
+%doc CONTRIBUTORS.md README.md
%changelog
commit php7-gmagick for openSUSE:Factory
Hello community,
here is the log from the commit of package php7-gmagick for openSUSE:Factory
checked in at 2018-01-06 18:48:39
Comparing /work/SRC/openSUSE:Factory/php7-gmagick (Old)
and /work/SRC/openSUSE:Factory/.php7-gmagick.new (New)
Package is "php7-gmagick"
Sat Jan 6 18:48:39 2018 rev:2 rq:561682 version:2.0.5RC1
Changes:
--- /work/SRC/openSUSE:Factory/php7-gmagick/php7-gmagick.changes
2017-08-24 18:36:44.525726464 +0200
+++ /work/SRC/openSUSE:Factory/.php7-gmagick.new/php7-gmagick.changes
2018-01-06 18:48:42.908560823 +0100
@@ -1,0 +2,7 @@
+Thu Jan 4 15:17:11 UTC 2018 - i...@ilya.pp.ua
+
+- Update to 2.0.5RC1
+ * ChangeLog
https://pecl.php.net/package-changelog.php?package=gmagick=2.0.5RC1
+ * hasNextImage() and hasPreviousImage() now actually returns TRUE on success
instead of Gmagick object.
+
+---
Old:
gmagick-2.0.4RC1.tgz
New:
gmagick-2.0.5RC1.tgz
Other differences:
--
++ php7-gmagick.spec ++
--- /var/tmp/diff_new_pack.kwvVZe/_old 2018-01-06 18:48:44.488487000 +0100
+++ /var/tmp/diff_new_pack.kwvVZe/_new 2018-01-06 18:48:44.492486813 +0100
@@ -1,7 +1,7 @@
#
# spec file for package php7-gmagick
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,19 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org
#
-
%define php_namephp7
%define pkg_namegmagick
Name: %{php_name}-%{pkg_name}
-Version:2.0.4RC1
+Version:2.0.5RC1
Release:0
Summary:Wrapper to the GraphicsMagick library
License:PHP-3.01
Group: Productivity/Networking/Web/Servers
-Url:https://pecl.php.net/package/gmagick
+URL:https://pecl.php.net/package/gmagick
Source0:https://pecl.php.net/get/%{pkg_name}-%{version}.tgz
Source1:%{pkg_name}.ini
BuildRequires: %{php_name}-devel >= 7.0.1
@@ -65,7 +64,6 @@
install --mode=0644 %{SOURCE1}
%{buildroot}%{_sysconfdir}/%{php_name}/conf.d/%{pkg_name}.ini
%files
-%defattr(0644,root,root,-)
%{_libdir}/%{php_name}/extensions/%{pkg_name}.so
%config(noreplace) %{_sysconfdir}/%{php_name}/conf.d/%{pkg_name}.ini
%doc CONTRIBUTORS.md LICENSE README.md
++ gmagick-2.0.4RC1.tgz -> gmagick-2.0.5RC1.tgz ++
35269 lines of diff (skipped)
