[packages/pam_wrapper] - updated to 1.0.3
commit 3c5a59ea10ec99fcfcdf419a9efb150ce012f8d6 Author: Jakub Bogusz Date: Wed Apr 26 05:54:30 2017 +0200 - updated to 1.0.3 pam_wrapper.spec | 8 1 file changed, 4 insertions(+), 4 deletions(-) --- diff --git a/pam_wrapper.spec b/pam_wrapper.spec index fedf56a..65a9d11 100644 --- a/pam_wrapper.spec +++ b/pam_wrapper.spec @@ -1,13 +1,13 @@ Summary: PAM wrapper library - tool to test PAM applications and modules Summary(pl.UTF-8): Biblioteka obudowująca PAM - narzędzie do testowania aplikacji i modułów PAM Name: pam_wrapper -Version: 1.0.2 +Version: 1.0.3 Release: 1 License: GPL v3+ Group: Libraries -Source0: http://www.samba.org/ftp/cwrap/%{name}-%{version}.tar.gz -# Source0-md5: 2f190f2490a212f1b5c2c2c237978f11 -URL: http://cwrap.org/pam_wrapper.html +Source0: https://www.samba.org/ftp/cwrap/%{name}-%{version}.tar.gz +# Source0-md5: 77ff54e3ab24260437db953eccad0db5 +URL: https://cwrap.org/pam_wrapper.html BuildRequires: cmake >= 2.8.0 # for tests #BuildRequires:cmocka-devel gitweb: http://git.pld-linux.org/gitweb.cgi/packages/pam_wrapper.git/commitdiff/3c5a59ea10ec99fcfcdf419a9efb150ce012f8d6 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: pam_wrapper: pam_wrapper-1.0.3.tar.gz
Request by: qboosh Files fetched: 1 STORED: https://www.samba.org/ftp/cwrap/pam_wrapper-1.0.3.tar.gz 77ff54e3ab24260437db953eccad0db5 pam_wrapper-1.0.3.tar.gz Size: 85419 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/evolution] - added destdir patch (removes redundant, not DESTDIR aware icons install, which trigger cmake bug l
commit 41112b859b9a58692f2f2c3277755ac803cb8c8a Author: Jakub Bogusz Date: Wed Apr 26 05:36:14 2017 +0200 - added destdir patch (removes redundant, not DESTDIR aware icons install, which trigger cmake bug leading to kill(-1, SIGKILL)) evolution-destdir.patch | 21 + evolution.spec | 7 +-- 2 files changed, 26 insertions(+), 2 deletions(-) --- diff --git a/evolution.spec b/evolution.spec index b27f29f..541478a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -24,6 +24,7 @@ Source5: %{name}-mail.desktop Source6: %{name}-tasks.desktop Patch0:%{name}-gtkdoc.patch Patch1:%{name}-highlight.patch +Patch2:%{name}-destdir.patch URL: http://wiki.gnome.org/Apps/Evolution/ BuildRequires: atk-devel BuildRequires: bison @@ -280,6 +281,7 @@ Dokumentacja API Evolution. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build export BOGOFILTER="/usr/bin/bogofilter" @@ -292,11 +294,12 @@ export SPAMD="/usr/bin/spamd" -DLIBEXEC_INSTALL_DIR=%{_libdir} \ %{!?with_autoar:-DENABLE_AUTOAR=OFF} \ %{?with_contact_maps:-DENABLE_CONTACT_MAPS=ON} \ + -DENABLE_GTK_DOC=ON \ + -DENABLE_SCHEMAS_COMPILE=OFF \ + -DGTK_UPDATE_ICON_CACHE=/bin/true \ -DWITH_OPENLDAP=%{?with_ldap:ON}%{!?with_ldap:OFF} \ -DWITH_STATIC_LDAP=OFF \ -DWITH_GLADE_CATALOG=%{?with_glade:ON} \ - -DENABLE_GTK_DOC=ON \ - -DENABLE_SCHEMAS_COMPILE=OFF \ -DVERSION_SUBSTRING=" PLD Linux" %{__make} diff --git a/evolution-destdir.patch b/evolution-destdir.patch new file mode 100644 index 000..c0688d7 --- /dev/null +++ b/evolution-destdir.patch @@ -0,0 +1,21 @@ +--- evolution-3.24.1/cmake/modules/IconCache.cmake.orig2017-04-10 10:02:00.0 +0200 evolution-3.24.1/cmake/modules/IconCache.cmake 2017-04-25 22:21:16.309917778 +0200 +@@ -45,9 +45,6 @@ + DESTINATION ${_destdir}/icons/${theme}/${size}/${context} + RENAME ${iconfile} + ) +- set(${_install_codevar} "${${_install_codevar}} +- COMMAND ${CMAKE_COMMAND} -E copy_if_different \"${CMAKE_CURRENT_SOURCE_DIR}/${srcfile}\" \"${_destdir}/icons/${theme}/${size}/${context}/${iconfile}\"" +- ) + endforeach(srcfile) + endmacro(process_icons) + +@@ -60,7 +57,7 @@ + + if(GTK_UPDATE_ICON_CACHE) + install(CODE +- "execute_process(${_install_code} ++ "execute_process( + COMMAND ${CMAKE_COMMAND} -E chdir . ${_update_icon_cache_cmd} + )") + endif(GTK_UPDATE_ICON_CACHE) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/evolution.git/commitdiff/41112b859b9a58692f2f2c3277755ac803cb8c8a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ruby-pkg-config] up to 1.2.0
commit bfe7e797da2cb23572824c566ce293c5b9cbcbb3 Author: Elan Ruusamäe Date: Tue Apr 25 22:19:46 2017 +0300 up to 1.2.0 x32.patch upstreamed https://github.com/ruby-gnome2/pkg-config/pull/12 ruby-pkg-config.spec | 6 ++ x32.patch| 35 --- 2 files changed, 2 insertions(+), 39 deletions(-) --- diff --git a/ruby-pkg-config.spec b/ruby-pkg-config.spec index 94b304d..a19c27d 100644 --- a/ruby-pkg-config.spec +++ b/ruby-pkg-config.spec @@ -6,14 +6,13 @@ Summary: pkg-config module for Ruby Summary(pl.UTF-8): Moduł pkg-config dla języka Ruby Name: ruby-%{pkgname} -Version: 1.1.9 +Version: 1.2.0 Release: 1 License: LGPL v2.1+ Group: Development/Languages Source0: http://rubygems.org/downloads/%{pkgname}-%{version}.gem -# Source0-md5: 18db5b1e1cb849567e42f5c61b24eb41 +# Source0-md5: 02fe48b71ffd9e03da9083bbe177dd22 Patch0:%{name}-avoid-cycle.patch -Patch1:x32.patch URL: https://github.com/ruby-gnome2/pkg-config BuildRequires: pkgconfig BuildRequires: rpm-rubyprov @@ -36,7 +35,6 @@ Moduł pkg-config dla języka Ruby. %prep %setup -q -n %{pkgname}-%{version} #%patch0 -p1 OUTDATED? UPSTREAMED? -%patch1 -p1 %build # write .gemspec diff --git a/x32.patch b/x32.patch deleted file mode 100644 index a7a1cf5..000 --- a/x32.patch +++ /dev/null @@ -1,35 +0,0 @@ -upstream: https://github.com/ruby-gnome2/pkg-config/pull/12 - pkg-config-1.1.9/lib/pkg-config.rb~2017-04-24 23:35:09.0 +0300 -+++ pkg-config-1.1.9/lib/pkg-config.rb 2017-04-24 23:36:14.496058353 +0300 -@@ -222,7 +222,7 @@ - all_libs = all_libs.join(" ").gsub(/-([Ll]) /, '\1').split.uniq - path_flags, other_flags = all_libs.partition {|flag| /\A-L/ =~ flag} - path_flags = path_flags.reject do |flag| -- /\A-L\/usr\/lib(?:64)?\z/ =~ flag -+ /\A-L\/usr\/lib(?:64|x32)?\z/ =~ flag - end - if @msvc_syntax - path_flags = path_flags.collect do |flag| -@@ -316,11 +316,13 @@ - arch_depended_path = Dir.glob('/usr/lib/*/pkgconfig').join(SEPARATOR) - default_paths = [ - "/usr/local/lib64/pkgconfig", -+ "/usr/local/libx32/pkgconfig", - "/usr/local/lib/pkgconfig", - "/usr/local/libdata/pkgconfig", - "/opt/local/lib/pkgconfig", - arch_depended_path, - "/usr/lib64/pkgconfig", -+ "/usr/libx32/pkgconfig", - "/usr/lib/pkgconfig", - "/usr/libdata/pkgconfig", - "/usr/X11/lib/pkgconfig", -@@ -302,6 +304,7 @@ - Dir.glob((pkg_config_prefix + "lib/*/pkgconfig").to_s).join(SEPARATOR) - [pkg_config_arch_depended_path, - (pkg_config_prefix + "lib64/pkgconfig").to_s, -+ (pkg_config_prefix + "libx32/pkgconfig").to_s, - (pkg_config_prefix + "lib/pkgconfig").to_s, - (pkg_config_prefix + "libdata/pkgconfig").to_s, - default_path].join(SEPARATOR) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ruby-pkg-config.git/commitdiff/bfe7e797da2cb23572824c566ce293c5b9cbcbb3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ruby-pkg-config: pkg-config-1.2.0.gem
Request by: glen Files fetched: 1 STORED: http://rubygems.org/downloads/pkg-config-1.2.0.gem 02fe48b71ffd9e03da9083bbe177dd22 pkg-config-1.2.0.gem Size: 19968 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/terminus-font] Conflict older freetype
commit d746718a61215b94d2688a82c50b6001ea7fa8c6 Author: Jacek Konieczny Date: Tue Apr 25 20:26:57 2017 +0200 Conflict older freetype terminus-font.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/terminus-font.spec b/terminus-font.spec index 2401056..08f5ea8 100644 --- a/terminus-font.spec +++ b/terminus-font.spec @@ -11,6 +11,7 @@ Source1: terminus-fonts-fontconfig.conf URL: http://sourceforge.net/projects/terminus-font/ BuildRequires: perl-base BuildRequires: xorg-app-bdftopcf +Conflicts: freetype < 1:2.7.1 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/terminus-font.git/commitdiff/d746718a61215b94d2688a82c50b6001ea7fa8c6 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/terminus-font] Update fontconfig for new freetype
commit dfd5ea921a8f9b0aa0a8c7e78bed1af38f651777 Author: Jacek Konieczny Date: Tue Apr 25 20:24:18 2017 +0200 Update fontconfig for new freetype Freetype changes family name of PCF fonts. terminus-font.spec | 2 +- terminus-fonts-fontconfig.conf | 7 +++ 2 files changed, 4 insertions(+), 5 deletions(-) --- diff --git a/terminus-font.spec b/terminus-font.spec index 3dbd84d..2401056 100644 --- a/terminus-font.spec +++ b/terminus-font.spec @@ -2,7 +2,7 @@ Summary:A clean fixed width font Summary(pl.UTF-8): Przejrzysty font o stałej szerokości Name: terminus-font Version: 4.40 -Release: 1 +Release: 2 License: SIL Open Font License v1.1 (font), GPL v2+ (utils) Group: Fonts Source0: http://downloads.sourceforge.net/terminus-font/%{name}-%{version}.tar.gz diff --git a/terminus-fonts-fontconfig.conf b/terminus-fonts-fontconfig.conf index 7000f66..b708e1d 100644 --- a/terminus-fonts-fontconfig.conf +++ b/terminus-fonts-fontconfig.conf @@ -4,13 +4,12 @@ monospace - Terminus + xos4 Terminus Terminus - - monospace - +xos4 Terminus +fixed gitweb: http://git.pld-linux.org/gitweb.cgi/packages/terminus-font.git/commitdiff/dfd5ea921a8f9b0aa0a8c7e78bed1af38f651777 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/tracker] - release 3 (by relup.sh)
commit 816d78df0dddb56c39dfd920f39b43a25de3e26d Author: Jan Rękorajski Date: Tue Apr 25 20:13:38 2017 +0200 - release 3 (by relup.sh) tracker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/tracker.spec b/tracker.spec index 64cb639..f9eb94a 100644 --- a/tracker.spec +++ b/tracker.spec @@ -12,7 +12,7 @@ Summary: Tracker - an indexing subsystem Summary(pl.UTF-8): Tracker - podsystem indeksujący Name: tracker Version: 1.10.5 -Release: 2 +Release: 3 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/tracker/1.10/%{name}-%{version}.tar.xz gitweb: http://git.pld-linux.org/gitweb.cgi/packages/tracker.git/commitdiff/816d78df0dddb56c39dfd920f39b43a25de3e26d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-pillow] - release 5 (by relup.sh)
commit be464ce031148ec1f88bb517559c81a213073413 Author: Jan Rękorajski Date: Tue Apr 25 20:13:27 2017 +0200 - release 5 (by relup.sh) python-pillow.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/python-pillow.spec b/python-pillow.spec index be1f266..b2d772c 100644 --- a/python-pillow.spec +++ b/python-pillow.spec @@ -12,7 +12,7 @@ Summary: Python image processing library Name: python-%{module} Version: 3.2.0 -Release: 4 +Release: 5 # License: see http://www.pythonware.com/products/pil/license.htm License: MIT Group: Libraries/Python gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-pillow.git/commitdiff/be464ce031148ec1f88bb517559c81a213073413 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/calibre] - release 4 (by relup.sh)
commit 130428523a85a506a26724564fd523dabb12cce6 Author: Jan Rękorajski Date: Tue Apr 25 19:44:28 2017 +0200 - release 4 (by relup.sh) calibre.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/calibre.spec b/calibre.spec index f3cc6ab..991fb9e 100644 --- a/calibre.spec +++ b/calibre.spec @@ -12,7 +12,7 @@ Summary: E-book converter and library management Summary(pl.UTF-8): Konwerter oraz biblioteka dla e-booków Name: calibre Version: 2.74.0 -Release: 3 +Release: 4 License: GPL v3+ Group: Applications/Multimedia Source0: %{name}-%{version}-nofonts.tar.xz gitweb: http://git.pld-linux.org/gitweb.cgi/packages/calibre.git/commitdiff/130428523a85a506a26724564fd523dabb12cce6 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ibus-qt] - release 6 (by relup.sh)
commit d154a60ba9fb96ec9f78079de865e62a725a6ab4 Author: Jan Rękorajski Date: Tue Apr 25 19:44:43 2017 +0200 - release 6 (by relup.sh) ibus-qt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/ibus-qt.spec b/ibus-qt.spec index ddc5d7d..7586be6 100644 --- a/ibus-qt.spec +++ b/ibus-qt.spec @@ -2,7 +2,7 @@ Summary:Qt IBus library and Qt input method plugin Summary(pl.UTF-8): Biblioteka Qt IBus oraz wtyczka metody wprowadzania znaków dla Qt Name: ibus-qt Version: 1.3.3 -Release: 5 +Release: 6 License: GPL v2+ Group: Libraries #Source0Download: https://github.com/ibus/ibus-qt/releases gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ibus-qt.git/commitdiff/d154a60ba9fb96ec9f78079de865e62a725a6ab4 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/intellij-idea-ultimate] up to 2017.1.2
commit 2da89e54475bc54d078ac7de2cc6663e561f28bf Author: Jan Palus Date: Tue Apr 25 19:29:22 2017 +0200 up to 2017.1.2 - shipped jre is 64bit so package only on 64bit intellij-idea-ultimate.spec | 49 ++--- 1 file changed, 28 insertions(+), 21 deletions(-) --- diff --git a/intellij-idea-ultimate.spec b/intellij-idea-ultimate.spec index e8a3ca3..419be47 100644 --- a/intellij-idea-ultimate.spec +++ b/intellij-idea-ultimate.spec @@ -3,12 +3,12 @@ %include /usr/lib/rpm/macros.java Summary: IntelliJ IDEA - The Most Intelligent Java IDE Name: intellij-idea-ultimate -Version: 2017.1.1 +Version: 2017.1.2 Release: 1 License: IntelliJ IDEA Commercial Group: Development/Tools Source0: http://download.jetbrains.com/idea/ideaIU-%{version}.tar.gz -# NoSource0-md5: 80451a19758d92f2413bd17d7dc482d2 +# NoSource0-md5: efcd728deb8063ebafa56ed643c7ddfa NoSource: 0 Source1: %{product}.desktop Patch0:xdg-paths.patch @@ -19,7 +19,9 @@ BuildRequires:rpmbuild(macros) >= 1.596 Requires: %{name}-libs = %{version}-%{release} Requires: desktop-file-utils Requires: jre >= 1.8 +%ifarch %{x8664} Suggests: %{name}-jre = %{version}-%{release} +%endif Suggests: java-jdbc-mysql Suggests: jdk >= 1.6 Suggests: open @@ -95,7 +97,10 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_appdir},%{_bindir},%{_pixmapsdir},%{_desktopdir}} cp -l build.txt $RPM_BUILD_ROOT/cp-test && l=l && rm -f $RPM_BUILD_ROOT/cp-test -cp -a$l bin help jre lib license plugins $RPM_BUILD_ROOT%{_appdir} +cp -a$l bin help lib license plugins $RPM_BUILD_ROOT%{_appdir} +%ifarch %{x8664} +cp -a$l jre64 $RPM_BUILD_ROOT%{_appdir} +%endif cp -p %{product}.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{product}.png ln -s %{_pixmapsdir}/%{product}.png $RPM_BUILD_ROOT%{_appdir}/bin/%{product}.png cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{product}.desktop @@ -145,23 +150,25 @@ rm -rf $RPM_BUILD_ROOT %{_appdir}/plugins %{_appdir}/help +%ifarch %{x8664} %files jre %defattr(644,root,root,755) -%dir %{_appdir}/jre -%dir %{_appdir}/jre/bin -%attr(755,root,root) %{_appdir}/jre/bin/java -%attr(755,root,root) %{_appdir}/jre/bin/jjs -%attr(755,root,root) %{_appdir}/jre/bin/keytool -%attr(755,root,root) %{_appdir}/jre/bin/orbd -%attr(755,root,root) %{_appdir}/jre/bin/pack200 -%attr(755,root,root) %{_appdir}/jre/bin/policytool -%attr(755,root,root) %{_appdir}/jre/bin/rmid -%attr(755,root,root) %{_appdir}/jre/bin/rmiregistry -%attr(755,root,root) %{_appdir}/jre/bin/servertool -%attr(755,root,root) %{_appdir}/jre/bin/tnameserv -%attr(755,root,root) %{_appdir}/jre/bin/unpack200 -%{_appdir}/jre/lib -%{_appdir}/jre/ASSEMBLY_EXCEPTION -%{_appdir}/jre/LICENSE -%{_appdir}/jre/release -%{_appdir}/jre/THIRD_PARTY_README +%dir %{_appdir}/jre64 +%dir %{_appdir}/jre64/bin +%attr(755,root,root) %{_appdir}/jre64/bin/java +%attr(755,root,root) %{_appdir}/jre64/bin/jjs +%attr(755,root,root) %{_appdir}/jre64/bin/keytool +%attr(755,root,root) %{_appdir}/jre64/bin/orbd +%attr(755,root,root) %{_appdir}/jre64/bin/pack200 +%attr(755,root,root) %{_appdir}/jre64/bin/policytool +%attr(755,root,root) %{_appdir}/jre64/bin/rmid +%attr(755,root,root) %{_appdir}/jre64/bin/rmiregistry +%attr(755,root,root) %{_appdir}/jre64/bin/servertool +%attr(755,root,root) %{_appdir}/jre64/bin/tnameserv +%attr(755,root,root) %{_appdir}/jre64/bin/unpack200 +%{_appdir}/jre64/lib +%{_appdir}/jre64/ASSEMBLY_EXCEPTION +%{_appdir}/jre64/LICENSE +%{_appdir}/jre64/release +%{_appdir}/jre64/THIRD_PARTY_README +%endif gitweb: http://git.pld-linux.org/gitweb.cgi/packages/intellij-idea-ultimate.git/commitdiff/2da89e54475bc54d078ac7de2cc6663e561f28bf ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qt5-qtimageformats] - release 4 (by relup.sh)
commit 8df0e2bc9eff96b31e83715ed195f4befaf42ee3 Author: Jan Rękorajski Date: Tue Apr 25 18:34:16 2017 +0200 - release 4 (by relup.sh) qt5-qtimageformats.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec index 68bdd3d..a346c33 100644 --- a/qt5-qtimageformats.spec +++ b/qt5-qtimageformats.spec @@ -9,7 +9,7 @@ Summary:The Qt5 Image Formats plugins Summary(pl.UTF-8): Wtyczki Qt5 Image Formats Name: qt5-%{orgname} Version: 5.5.1 -Release: 3 +Release: 4 License: LGPL v2.1 with Digia Qt LGPL Exception v1.1 or GPL v3.0 Group: X11/Libraries Source0: http://download.qt.io/official_releases/qt/5.5/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtimageformats.git/commitdiff/8df0e2bc9eff96b31e83715ed195f4befaf42ee3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/icu] - added cxx-pre11 patch (allow using C++ API in GCC c++98/c++03 mode) - release 2
commit 0e2868a505e6050591a179e66205b588ccd0a065 Author: Jakub Bogusz Date: Tue Apr 25 18:07:02 2017 +0200 - added cxx-pre11 patch (allow using C++ API in GCC c++98/c++03 mode) - release 2 icu-cxx-pre11.patch | 174 icu.spec| 4 +- 2 files changed, 177 insertions(+), 1 deletion(-) --- diff --git a/icu.spec b/icu.spec index cf2c487..3076f5a 100644 --- a/icu.spec +++ b/icu.spec @@ -7,11 +7,12 @@ Summary: International Components for Unicode Summary(pl.UTF-8): Międzynarodowe komponenty dla unikodu Name: icu Version: 59.1 -Release: 1 +Release: 2 License: MIT-like Group: Libraries Source0: http://download.icu-project.org/files/icu4c/%{version}/%{name}4c-%{ver}-src.tgz # Source0-md5: 54923fa9fab5b2b83f235fb72523de37 +Patch0:%{name}-cxx-pre11.patch URL: http://www.icu-project.org/ BuildRequires: autoconf >= 2.69 BuildRequires: libstdc++-devel @@ -94,6 +95,7 @@ biblioteki programistyczne ICU. %prep %setup -q -n %{name} +%patch0 -p1 %build cd source diff --git a/icu-cxx-pre11.patch b/icu-cxx-pre11.patch new file mode 100644 index 000..3a4457a --- /dev/null +++ b/icu-cxx-pre11.patch @@ -0,0 +1,174 @@ +--- icu/source/common/unicode/umachine.h.orig 2017-03-16 20:01:12.0 +0100 icu/source/common/unicode/umachine.h 2017-04-24 21:51:37.750924621 +0200 +@@ -295,7 +295,7 @@ + * If 1, then char16_t is a typedef and not a real type (yet) + * @internal + */ +-#if (U_PLATFORM == U_PF_AIX) && defined(__cplusplus) &&(U_CPLUSPLUS_VERSION < 11) ++#if ((U_PLATFORM == U_PF_AIX) || defined(__GNUC__)) && defined(__cplusplus) && (U_CPLUSPLUS_VERSION < 11) + // for AIX, uchar.h needs to be included + # include + # define U_CHAR16_IS_TYPEDEF 1 +--- icu/source/common/unicode/char16ptr.h.orig 2017-03-29 06:44:37.0 +0200 icu/source/common/unicode/char16ptr.h 2017-04-25 17:32:39.386782173 +0200 +@@ -61,12 +61,14 @@ + */ + inline Char16Ptr(wchar_t *p); + #endif ++#ifdef U_HAS_NULLPTR_T + /** + * nullptr constructor. + * @param p nullptr + * @draft ICU 59 + */ + inline Char16Ptr(std::nullptr_t p); ++#endif + /** + * Destructor. + * @draft ICU 59 +@@ -114,7 +116,9 @@ + #if U_SIZEOF_WCHAR_T==2 + Char16Ptr::Char16Ptr(wchar_t *p) : p(cast(p)) {} + #endif ++#ifdef U_HAS_NULLPTR_T + Char16Ptr::Char16Ptr(std::nullptr_t p) : p(p) {} ++#endif + Char16Ptr::~Char16Ptr() { + U_ALIASING_BARRIER(p); + } +@@ -130,7 +134,9 @@ + #if U_SIZEOF_WCHAR_T==2 + Char16Ptr::Char16Ptr(wchar_t *p) { u.wp = p; } + #endif ++#ifdef U_HAS_NULLPTR_T + Char16Ptr::Char16Ptr(std::nullptr_t p) { u.cp = p; } ++#endif + Char16Ptr::~Char16Ptr() {} + + char16_t *Char16Ptr::get() const { return u.cp; } +@@ -168,12 +174,14 @@ + */ + inline ConstChar16Ptr(const wchar_t *p); + #endif ++#ifdef U_HAS_NULLPTR_T + /** + * nullptr constructor. + * @param p nullptr + * @draft ICU 59 + */ + inline ConstChar16Ptr(const std::nullptr_t p); ++#endif + + /** + * Destructor. +@@ -222,7 +230,9 @@ + #if U_SIZEOF_WCHAR_T==2 + ConstChar16Ptr::ConstChar16Ptr(const wchar_t *p) : p(cast(p)) {} + #endif ++#ifdef U_HAS_NULLPTR_T + ConstChar16Ptr::ConstChar16Ptr(const std::nullptr_t p) : p(p) {} ++#endif + ConstChar16Ptr::~ConstChar16Ptr() { + U_ALIASING_BARRIER(p); + } +@@ -238,7 +248,9 @@ + #if U_SIZEOF_WCHAR_T==2 + ConstChar16Ptr::ConstChar16Ptr(const wchar_t *p) { u.wp = p; } + #endif ++#ifdef U_HASH_NULLPTR_T + ConstChar16Ptr::ConstChar16Ptr(const std::nullptr_t p) { u.cp = p; } ++#endif + ConstChar16Ptr::~ConstChar16Ptr() {} + + const char16_t *ConstChar16Ptr::get() const { return u.cp; } +--- icu/source/common/unicode/platform.h.orig 2017-03-22 20:06:26.0 +0100 icu/source/common/unicode/platform.h 2017-04-25 17:30:01.483450642 +0200 +@@ -503,6 +503,10 @@ + namespace std { + typedef decltype(nullptr) nullptr_t; + }; ++# define U_HAS_NULLPTR_T 1 ++#elif defined(__cplusplus) && (U_CPLUSPLUS_VERSION >= 11) ++# define U_HAS_NULLPTR_T 1 ++// else no U_HAS_NULLPTR_T + #endif + + /** +--- icu/source/common/unicode/unistr.h.orig2017-03-29 06:44:37.0 +0200 icu/source/common/unicode/unistr.h 2017-04-25 17:33:43.030114781 +0200 +@@ -3049,6 +3049,7 @@ +* Do not use #ifndef U_HIDE_DRAFT_API for the following constructor, +* it should always be available regardless of U_HIDE_DRAFT_API status +*/ ++#ifdef U_HAS_NULLPTR_T + /** +* nullptr_t constructor. +* Effectively the same as the default constructor, makes an empty string object. +@@ -3060,6 +3061,7 @@ +* @draft ICU 59 +*/ + UNISTR_FROM_STRING_EXPLICIT inline UnicodeString(const std::nullptr_t text); ++#endif + + /** +* char16_t* constructor. +@@ -3108,6 +3110,7 @@ +* Do not use #ifndef U_HIDE_DRAFT_API for the following constructor, +* it
[packages/qt5-qtwebkit] - rel 7
commit 12a85d01b329b24ec31c287fd9e9f4d43eef3896 Author: Jan Rękorajski Date: Tue Apr 25 17:16:35 2017 +0200 - rel 7 qt5-qtwebkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 8afe513..d977c10 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -27,7 +27,7 @@ Summary: The Qt5 WebKit libraries Summary(pl.UTF-8): Biblioteki Qt5 WebKit Name: qt5-%{orgname} Version: 5.5.1 -Release: 6.1 +Release: 7 License: LGPL v2+ Group: X11/Libraries Source0: http://download.qt.io/official_releases/qt/5.5/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebkit.git/commitdiff/12a85d01b329b24ec31c287fd9e9f4d43eef3896 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qt5-qtbase] - rel 11
commit f48a6243aabd050b2dc5939f7193665bb21d8ee3 Author: Jan Rękorajski Date: Tue Apr 25 17:15:53 2017 +0200 - rel 11 qt5-qtbase.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index e060ba4..2cccb0a 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -66,7 +66,7 @@ Summary: Qt5 - base components Summary(pl.UTF-8): Biblioteka Qt5 - podstawowe komponenty Name: qt5-%{orgname} Version: 5.5.1 -Release: 10.2 +Release: 11 # See LGPL_EXCEPTION.txt for exception details License: LGPL v2 with Digia Qt LGPL Exception v1.1 or GPL v3 Group: X11/Libraries gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtbase.git/commitdiff/f48a6243aabd050b2dc5939f7193665bb21d8ee3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qt5-qtwebkit] - bootstrap rebuild
commit 6949eefbdab6e0956f91174d42f0c0e18897f58d Author: Jan Rękorajski Date: Tue Apr 25 16:08:07 2017 +0200 - bootstrap rebuild qt5-qtwebkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 1e47a9b..8afe513 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -27,7 +27,7 @@ Summary: The Qt5 WebKit libraries Summary(pl.UTF-8): Biblioteki Qt5 WebKit Name: qt5-%{orgname} Version: 5.5.1 -Release: 6 +Release: 6.1 License: LGPL v2+ Group: X11/Libraries Source0: http://download.qt.io/official_releases/qt/5.5/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebkit.git/commitdiff/6949eefbdab6e0956f91174d42f0c0e18897f58d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qt5-qtwebkit] - fix type_must_have_known_encoded_size assertions
commit 50e4885ea50ae50876099807481f6799daac2693 Author: Jan Rękorajski Date: Tue Apr 25 14:50:35 2017 +0200 - fix type_must_have_known_encoded_size assertions new-char-types.patch | 35 +++ qt5-qtwebkit.spec| 2 ++ 2 files changed, 37 insertions(+) --- diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index a8ef8d5..1e47a9b 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -33,6 +33,7 @@ Group:X11/Libraries Source0: http://download.qt.io/official_releases/qt/5.5/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz # Source0-md5: 681328edb539b8fa3a273b38c90b3e31 Patch0:icu59.patch +Patch1:new-char-types.patch URL: http://www.qt.io/ BuildRequires: OpenGL-devel BuildRequires: Qt5Core-devel >= %{qtbase_ver} @@ -171,6 +172,7 @@ Dokumentacja do bibliotek Qt5 WebKit w formacie QCH. %prep %setup -q -n %{orgname}-opensource-src-%{version} %patch0 -p1 +%patch1 -p1 %build qmake-qt5 \ diff --git a/new-char-types.patch b/new-char-types.patch new file mode 100644 index 000..a096203 --- /dev/null +++ b/new-char-types.patch @@ -0,0 +1,35 @@ +diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h +index ead844f..e62cfd4 100644 +--- a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h +@@ -61,6 +61,7 @@ + #define WTF_COMPILER_SUPPORTS_HAS_TRIVIAL_DESTRUCTOR __has_feature(has_trivial_destructor) + #define WTF_COMPILER_SUPPORTS_CXX_STRONG_ENUMS __has_feature(cxx_strong_enums) + #define WTF_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS __has_feature(cxx_reference_qualified_functions) ++#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES !defined(_LIBCPP_HAS_NO_UNICODE_CHARS) + + #endif + +@@ -142,6 +143,7 @@ + #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1 + #endif + #if GCC_VERSION_AT_LEAST(4, 5, 0) ++#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES 1 + #define WTF_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS 1 + #endif + #if GCC_VERSION_AT_LEAST(4, 6, 0) +diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h +index b9e46bc..876fa45 100644 +--- a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h +@@ -75,6 +75,10 @@ namespace WTF { + #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) + template<> struct IsInteger{ static const bool value = true; }; + #endif ++#if COMPILER_SUPPORTS(CXX_NEW_CHAR_TYPES) ++template<> struct IsInteger { static const bool value = true; }; ++template<> struct IsInteger { static const bool value = true; }; ++#endif + + template struct IsFloatingPoint { static const bool value = false; }; + template<> struct IsFloatingPoint{ static const bool value = true; }; gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebkit.git/commitdiff/50e4885ea50ae50876099807481f6799daac2693 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kde4-calligra] - release 19 (by relup.sh)
commit 30c0ee634c0865ebd9aa4b5817241f448f66edae Author: Jan Rękorajski Date: Tue Apr 25 13:50:21 2017 +0200 - release 19 (by relup.sh) kde4-calligra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/kde4-calligra.spec b/kde4-calligra.spec index fbe5244..c19a437 100644 --- a/kde4-calligra.spec +++ b/kde4-calligra.spec @@ -27,7 +27,7 @@ Summary: Calligra - powerful office suite for KDE Summary(pl.UTF-8): Calligra - potężny pakiet biurowy dla KDE Name: kde4-calligra Version: 2.8.7 -Release: 18 +Release: 19 License: GPL/LGPL Group: X11/Applications Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{orgname}-%{version}/%{orgname}-%{version}.tar.xz gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kde4-calligra.git/commitdiff/30c0ee634c0865ebd9aa4b5817241f448f66edae ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ffmpeg] - rel 4
commit 0bc2926a16cc9b5d2880a0f1b6de7dcceae0b618 Author: Jan Rękorajski Date: Tue Apr 25 13:17:29 2017 +0200 - rel 4 ffmpeg.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/ffmpeg.spec b/ffmpeg.spec index 2fee123..372e63b 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -65,7 +65,7 @@ Summary: FFmpeg - a very fast video and audio converter Summary(pl.UTF-8): FFmpeg - szybki konwerter audio/wideo Name: ffmpeg Version: 3.2.4 -Release: 3.1 +Release: 4 # LGPL or GPL, chosen at configure time (GPL version is more featured) # (postprocessing, some filters, x264, x265, xavs, xvid, x11grab) # using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/0bc2926a16cc9b5d2880a0f1b6de7dcceae0b618 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kde4-kdebase-runtime] - fix moc parsing - rel 8
commit 8088c7e6535d88e07ad2f915c06fa7f53a2d847c Author: Jan Rękorajski Date: Tue Apr 25 10:51:38 2017 + - fix moc parsing - rel 8 kde4-kdebase-runtime.spec | 4 +++- moc.patch | 43 +++ 2 files changed, 46 insertions(+), 1 deletion(-) --- diff --git a/kde4-kdebase-runtime.spec b/kde4-kdebase-runtime.spec index 0796ea4..32f77e8 100644 --- a/kde4-kdebase-runtime.spec +++ b/kde4-kdebase-runtime.spec @@ -12,7 +12,7 @@ Summary: KDE 4 base runtime components Summary(pl.UTF-8): Komponenty uruchomieniowe podstawowej części KDE 4 Name: kde4-kdebase-runtime Version: 4.14.3 -Release: 7 +Release: 8 License: GPL v2+ Group: X11/Applications Source0: http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz @@ -22,6 +22,7 @@ Source1: kdebase-searchproviders.tar.bz2 Source2: l10n-iso639-1 Patch100: %{name}-branch.diff Patch0:%{name}-rpc.patch +Patch1:moc.patch URL: http://www.kde.org/ BuildRequires: NetworkManager-devel >= 0.7.0 BuildRequires: OpenEXR-devel @@ -112,6 +113,7 @@ Wtyczki KDE 4 dla Phonona. %setup -q -n %{orgname}-%{version} -a1 #%patch100 -p1 %patch0 -p1 +%patch1 -p1 %build install -d build diff --git a/moc.patch b/moc.patch new file mode 100644 index 000..cf4cf7e --- /dev/null +++ b/moc.patch @@ -0,0 +1,43 @@ +diff -ur kde-runtime-4.14.3/kwalletd/backend/kwalletbackend.h kde-runtime-4.14.3-moc/kwalletd/backend/kwalletbackend.h +--- kde-runtime-4.14.3/kwalletd/backend/kwalletbackend.h 2014-10-30 23:50:20.0 + kde-runtime-4.14.3-moc/kwalletd/backend/kwalletbackend.h 2017-04-25 10:42:34.751952357 + +@@ -30,9 +30,11 @@ + #include "kwalletentry.h" + #include "backendpersisthandler.h" + ++#ifndef Q_MOC_RUN + #ifdef HAVE_QGPGME + #include + #endif // HAVE_QGPGME ++#endif + + #define PBKDF2_SHA512_KEYSIZE 56 + #define PBKDF2_SHA512_SALTSIZE 56 +diff -ur kde-runtime-4.14.3/kwalletd/knewwalletdialog.h kde-runtime-4.14.3-moc/kwalletd/knewwalletdialog.h +--- kde-runtime-4.14.3/kwalletd/knewwalletdialog.h 2014-10-30 23:50:20.0 + kde-runtime-4.14.3-moc/kwalletd/knewwalletdialog.h 2017-04-25 10:40:54.701953082 + +@@ -23,7 +23,9 @@ + + #include "ui_knewwalletdialogintro.h" + #include "ui_knewwalletdialoggpg.h" ++#ifndef Q_MOC_RUN + #include ++#endif + + namespace GpgME { + class Key; +diff -ur kde-runtime-4.14.3/kwalletd/kwalletwizard.h kde-runtime-4.14.3-moc/kwalletd/kwalletwizard.h +--- kde-runtime-4.14.3/kwalletd/kwalletwizard.h2014-10-30 23:50:20.0 + kde-runtime-4.14.3-moc/kwalletd/kwalletwizard.h2017-04-25 10:40:33.235286570 + +@@ -20,9 +20,11 @@ + #define KWALLETWIZARD_H + + #include ++#ifndef Q_MOC_RUN + #ifdef HAVE_QGPGME + #include + #endif ++#endif + + class PageGpgKey; + class PagePassword; gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdebase-runtime.git/commitdiff/8088c7e6535d88e07ad2f915c06fa7f53a2d847c ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/opencv] - release 7 (by relup.sh)
commit c81fdd912b3d48c0dfcadd2ea06800ee712c2df4 Author: Jan Rękorajski Date: Tue Apr 25 12:23:00 2017 +0200 - release 7 (by relup.sh) opencv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/opencv.spec b/opencv.spec index f9297ae..a5692c7 100644 --- a/opencv.spec +++ b/opencv.spec @@ -53,7 +53,7 @@ Summary: A library of programming functions mainly aimed at real time computer v Summary(pl.UTF-8): Biblioteka funkcji do grafiki komputerowej w czasie rzeczywistym Name: opencv Version: 3.1.0 -Release: 6 +Release: 7 Epoch: 1 %if %{with unicap} || %{with xine} License: GPL (enforced by used libraries), BSD (opencv itself) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/opencv.git/commitdiff/c81fdd912b3d48c0dfcadd2ea06800ee712c2df4 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/OpenImageIO] - release 4 (by relup.sh)
commit 68fd93265ec46eab82780247673efedbca56b5f1 Author: Jan Rękorajski Date: Tue Apr 25 11:40:44 2017 +0200 - release 4 (by relup.sh) OpenImageIO.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/OpenImageIO.spec b/OpenImageIO.spec index 1fad0f9..9ec36de 100644 --- a/OpenImageIO.spec +++ b/OpenImageIO.spec @@ -17,7 +17,7 @@ Summary: Library for reading and writing images Summary(pl.UTF-8): Biblioteka do odczytu i zapisu obrazów Name: OpenImageIO Version: 1.7.11 -Release: 3 +Release: 4 License: BSD Group: Libraries Source0: https://github.com/OpenImageIO/oiio/tarball/Release-%{version}/%{name}-%{version}.tar.gz gitweb: http://git.pld-linux.org/gitweb.cgi/packages/OpenImageIO.git/commitdiff/68fd93265ec46eab82780247673efedbca56b5f1 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ImageMagick/ImageMagick-6] - rel 4
commit d81f8ca2977a56d40516f2d76c4381e82d5377d5 Author: Jan Rękorajski Date: Tue Apr 25 09:33:40 2017 + - rel 4 ImageMagick.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/ImageMagick.spec b/ImageMagick.spec index b1638b8..a2cd863 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -36,7 +36,7 @@ Summary(tr.UTF-8):X altında resim gösterme, çevirme ve değişiklik yapma Summary(uk.UTF-8): Перегляд, конвертування та обробка зображень під X Window Name: ImageMagick6 Version: %{ver}%{?pver:.%{pver}} -Release: 3 +Release: 4 Epoch: 1 License: Apache-like Group: X11/Applications/Graphics gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/d81f8ca2977a56d40516f2d76c4381e82d5377d5 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ImageMagick] - release 2 (by relup.sh)
commit 7afd2a3f2ff3f9014b912d5c9d0714a9f1f4c688 Author: Jan Rękorajski Date: Tue Apr 25 11:14:01 2017 +0200 - release 2 (by relup.sh) ImageMagick.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/ImageMagick.spec b/ImageMagick.spec index 837df39..2d02c1d 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -33,7 +33,7 @@ Summary(tr.UTF-8):X altında resim gösterme, çevirme ve değişiklik yapma Summary(uk.UTF-8): Перегляд, конвертування та обробка зображень під X Window Name: ImageMagick Version: %{ver}%{?pver:.%{pver}} -Release: 1 +Release: 2 Epoch: 1 License: Apache-like Group: X11/Applications/Graphics gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/7afd2a3f2ff3f9014b912d5c9d0714a9f1f4c688 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/graphviz] - updated qt BRs - rel 21
commit d0b67ccbf67a084f358a2e4a101f19cc492d90e5 Author: Jan Rękorajski Date: Tue Apr 25 09:05:56 2017 + - updated qt BRs - rel 21 graphviz.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- diff --git a/graphviz.spec b/graphviz.spec index 141b7da..0f82c95 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -45,7 +45,7 @@ Summary: Graph Visualization Tools Summary(pl.UTF-8): Narzędzie do wizualizacji w postaci grafów Name: graphviz Version: 2.38.0 -Release: 20 +Release: 21 License: CPL v1.0 Group: X11/Applications/Graphics Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz @@ -150,6 +150,7 @@ BuildRequires: libglade2-devel >= 2.0 %if %{with qt} BuildRequires: QtCore-devel >= 4 BuildRequires: QtGui-devel >= 4 +BuildRequires: qt4-build >= 4 BuildRequires: qt4-qmake >= 4 %endif Requires(post,postun): /sbin/ldconfig gitweb: http://git.pld-linux.org/gitweb.cgi/packages/graphviz.git/commitdiff/d0b67ccbf67a084f358a2e4a101f19cc492d90e5 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/qt4] - fix building with icu 59 - rel 15
commit 0033f367a1d3b6de5a9ab5955ba79120b0d02d21 Author: Jan Rękorajski Date: Tue Apr 25 08:56:02 2017 + - fix building with icu 59 - rel 15 icu59.patch | 11 +++ qt4.spec| 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) --- diff --git a/qt4.spec b/qt4.spec index 7fc0bc9..d7b4fa3 100644 --- a/qt4.spec +++ b/qt4.spec @@ -61,7 +61,7 @@ Summary(pl.UTF-8):Biblioteka Qt do tworzenia GUI Summary(pt_BR.UTF-8): Estrutura para rodar aplicações GUI Qt Name: qt4 Version: 4.8.7 -Release: 14 +Release: 15 License: LGPL v2.1 or GPL v3.0 Group: X11/Libraries Source0: http://download.qt-project.org/official_releases/qt/4.8/%{version}/qt-everywhere-opensource-src-%{version}.tar.gz @@ -124,6 +124,7 @@ Patch45: qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch Patch46: qt-everywhere-opensource-src-4.8.3-qdbusconnection_no_debug.patch Patch47: qt-everywhere-opensource-src-4.8.2--assistant-crash.patch Patch48: qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch +Patch49: icu59.patch URL: http://qt-project.org/ %{?with_ibase:BuildRequires: Firebird-devel} %{?with_openvg:BuildRequires: Mesa-libOpenVG-devel} @@ -1560,6 +1561,7 @@ Programas exemplo para o Qt versão. %patch46 -p1 %patch47 -p1 %patch48 -p1 +%patch49 -p1 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \ mkspecs/common/linux.conf diff --git a/icu59.patch b/icu59.patch new file mode 100644 index 000..ed6a8b5 --- /dev/null +++ b/icu59.patch @@ -0,0 +1,11 @@ +--- qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp~ 2017-04-25 07:42:22.0 + qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp 2017-04-25 07:44:34.675363008 + +@@ -43,6 +43,8 @@ + #include "qlibrary.h" + #include "qdebug.h" + ++#define UCHAR_TYPE unsigned short ++ + #include "unicode/uversion.h" + #include "unicode/ucol.h" + gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qt4.git/commitdiff/0033f367a1d3b6de5a9ab5955ba79120b0d02d21 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit