June 2021 - openSUSE Commits - openSUSE Mailing Lists

commit xfig for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xfig for openSUSE:Factory checked in at 2021-06-29 22:43:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfig (Old) and /work/SRC/openSUSE:Factory/.xfig.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfig" Tue Jun 29 22:43:04 2021 rev:52 rq:902847 version:3.2.8a Changes: -------- --- /work/SRC/openSUSE:Factory/xfig/xfig.changes 2021-04-06 17:31:10.587218423 +0200 +++ /work/SRC/openSUSE:Factory/.xfig.new.2625/xfig.changes 2021-06-29 22:43:45.282912836 +0200 @@ -1,0 +2,7 @@ +Fri Jun 18 13:26:56 UTC 2021 - Dr. Werner Fink <werner(a)suse.de> + +- Make spec file build with older SLE versions as well to be able + to bundle this with a security update of package transfig + * This version requires transfig version 3.2.8 and above + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfig.spec ++++++ --- /var/tmp/diff_new_pack.5Y23je/_old 2021-06-29 22:43:45.730913427 +0200 +++ /var/tmp/diff_new_pack.5Y23je/_new 2021-06-29 22:43:45.734913433 +0200 @@ -45,16 +45,24 @@ BuildRequires: fdupes BuildRequires: flex BuildRequires: freetype2-devel -BuildRequires: libXmu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: netpbm BuildRequires: pkgconfig BuildRequires: update-desktop-files +%if 0%{?suse_version} > 1310 BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xaw3d) BuildRequires: pkgconfig(xaw6) +BuildRequires: pkgconfig(xmu) BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xt) +%else +BuildRequires: xaw3d-devel +BuildRequires: xorg-x11-devel +BuildRequires: xz +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%endif Requires: efont-unicode Requires: ghostscript-fonts-std Requires: ifnteuro @@ -65,10 +73,11 @@ Requires: xorg-x11-fonts Requires: xorg-x11-fonts-core Provides: xfig.3.2.3d -%if 0%{?suse_version} > 1310 -BuildRequires: libXaw3d-devel -%else -BuildRequires: xaw3d-devel +%if ! %{defined make_build} +%define make_build make %{?_smp_mflags} +%endif +%if ! %{defined make_install} +%define make_install make install DESTDIR=%{?buildroot} INSTALL="install -p" %endif %description

1 0

commit stress-ng for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package stress-ng for openSUSE:Factory checked in at 2021-06-29 22:43:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stress-ng (Old) and /work/SRC/openSUSE:Factory/.stress-ng.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "stress-ng" Tue Jun 29 22:43:04 2021 rev:102 rq:902844 version:0.12.11 Changes: -------- --- /work/SRC/openSUSE:Factory/stress-ng/stress-ng.changes 2021-06-09 21:52:44.866522405 +0200 +++ /work/SRC/openSUSE:Factory/.stress-ng.new.2625/stress-ng.changes 2021-06-29 22:43:44.426911707 +0200 @@ -1,0 +2,7 @@ +Mon Jun 28 12:35:20 UTC 2021 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 0.12.11 + See http://kernel.ubuntu.com/git/cking/stress-ng.git/plain/debian/changelog + for the full changelog + +------------------------------------------------------------------- Old: ---- stress-ng-0.12.10.tar.xz New: ---- stress-ng-0.12.11.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stress-ng.spec ++++++ --- /var/tmp/diff_new_pack.YTXZ8r/_old 2021-06-29 22:43:44.894912324 +0200 +++ /var/tmp/diff_new_pack.YTXZ8r/_new 2021-06-29 22:43:44.898912329 +0200 @@ -18,7 +18,7 @@ Name: stress-ng -Version: 0.12.10 +Version: 0.12.11 Release: 0 Summary: Tool to load and stress a computer License: GPL-2.0-only ++++++ stress-ng-0.12.10.tar.xz -> stress-ng-0.12.11.tar.xz ++++++ ++++ 3973 lines of diff (skipped)

1 0

commit libvma for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libvma for openSUSE:Factory checked in at 2021-06-29 22:43:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvma (Old) and /work/SRC/openSUSE:Factory/.libvma.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvma" Tue Jun 29 22:43:02 2021 rev:10 rq:902832 version:9.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libvma/libvma.changes 2021-04-29 01:39:29.110670671 +0200 +++ /work/SRC/openSUSE:Factory/.libvma.new.2625/libvma.changes 2021-06-29 22:43:43.550910550 +0200 @@ -1,0 +2,8 @@ +Mon Jun 28 12:54:15 UTC 2021 - Nicolas Morey-Chaisemartin <nmoreychaisemartin(a)suse.com> + +- Update to 9.3.1 + - Remove multi packets (MP-RQ) depracated code + - Several bug fixes + - See CHANGES for a complete list + +------------------------------------------------------------------- Old: ---- libvma-9.2.2.0.1610cf601e5a.tar.gz New: ---- libvma-9.3.1.0.47396f1a5eaa.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvma.spec ++++++ --- /var/tmp/diff_new_pack.uDWaoY/_old 2021-06-29 22:43:43.946911073 +0200 +++ /var/tmp/diff_new_pack.uDWaoY/_new 2021-06-29 22:43:43.950911078 +0200 @@ -17,14 +17,14 @@ # -%define git_ver .0.1610cf601e5a +%define git_ver .0.47396f1a5eaa %define lib_major 9 Name: libvma Summary: A library for boosting TCP and UDP traffic (over RDMA hardware) License: BSD-2-Clause OR GPL-2.0-only Group: Development/Libraries/C and C++ -Version: 9.2.2 +Version: 9.3.1 Release: 0 Source0: %{name}-%{version}%{git_ver}.tar.gz Source1: vma.service @@ -113,13 +113,10 @@ %defattr(-,root,root,-) %dir %{_datadir}/%{name} %dir %{_docdir}/%{name} -%{_docdir}/%{name}/README.txt -%{_docdir}/%{name}/journal.txt -%{_docdir}/%{name}/VMA_VERSION +%{_docdir}/%{name}/README +%{_docdir}/%{name}/CHANGES %config(noreplace) %{_sysconfdir}/libvma.conf -%config %{_sysconfdir}/security/limits.d/30-libvma-limits.conf %{_sbindir}/vmad -%{_sbindir}/vma %{_sbindir}/rcvma %{_unitdir}/vma.service %{_bindir}/vma_stats ++++++ _service ++++++ --- /var/tmp/diff_new_pack.uDWaoY/_old 2021-06-29 22:43:43.978911115 +0200 +++ /var/tmp/diff_new_pack.uDWaoY/_new 2021-06-29 22:43:43.982911121 +0200 @@ -6,7 +6,7 @@ <param name="exclude">.git</param> <param name="filename">libvma</param> <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param> - <param name="revision">1610cf601e5a601672bdade4f8c70a9fd47f5f24</param> + <param name="revision">47396f1a5eaa98e589be0684c921c885e88d2ac3</param> </service> <service name="recompress" mode="disabled"> <param name="file">libvma*.tar</param> ++++++ libvma-9.2.2.0.1610cf601e5a.tar.gz -> libvma-9.3.1.0.47396f1a5eaa.tar.gz ++++++ ++++ 80822 lines of diff (skipped)

1 0

commit python-openqa_review for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-openqa_review for openSUSE:Factory checked in at 2021-06-29 22:43:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-openqa_review (Old) and /work/SRC/openSUSE:Factory/.python-openqa_review.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-openqa_review" Tue Jun 29 22:43:01 2021 rev:41 rq:902827 version:1.25.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-openqa_review/python-openqa_review.changes 2021-06-26 21:25:57.435382458 +0200 +++ /work/SRC/openSUSE:Factory/.python-openqa_review.new.2625/python-openqa_review.changes 2021-06-29 22:43:39.902905736 +0200 @@ -1,0 +2,14 @@ +Mon Jun 28 13:11:42 UTC 2021 - okurz(a)suse.com + +- Update to version 1.25.0: + * Make link to HTML report variable + * doc: Add CURL_CA_BUNDLE + * Improve handling of --filter + * Add User-Agent header to HTTP requests + * Fix relative import path for directly called testsuite + * Remove futurize from tests + * Update setup.py - remove python2 compactibility stuff + * Fix handling of softfail bugrefs + * Issue: Consistently Use self.bugref instead of bugref from arg + +------------------------------------------------------------------- Old: ---- python-openqa_review-1.24.0.obscpio New: ---- python-openqa_review-1.25.0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-openqa_review.spec ++++++ --- /var/tmp/diff_new_pack.Ah5pcn/_old 2021-06-29 22:43:41.462907795 +0200 +++ /var/tmp/diff_new_pack.Ah5pcn/_new 2021-06-29 22:43:41.466907800 +0200 @@ -33,13 +33,13 @@ %define binaries openqa-review openqa-review-daily-email openqa-review-sles-ha tumblesle-release openqa-review-functional_yast_concise %define oldpython python Name: python-%{short_name}%{?name_ext} -Version: 1.24.0 +Version: 1.25.0 Release: 0 Summary: A review helper script for openQA License: MIT Group: Development/Languages/Python Source: python-%{short_name}-%{version}.tar.xz -URL: https://github.com/okurz/%{short_name} +URL: https://github.com/os-autoinst/%{short_name} BuildRequires: python-rpm-macros %if 0%{?_test} BuildRequires: python3-%{short_name} == %{version} ++++++ python-openqa_review-1.24.0.obscpio -> python-openqa_review-1.25.0.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-openqa_review-1.24.0/bin/openqa-review-daily-email new/python-openqa_review-1.25.0/bin/openqa-review-daily-email --- old/python-openqa_review-1.24.0/bin/openqa-review-daily-email 2021-06-25 19:01:38.000000000 +0200 +++ new/python-openqa_review-1.25.0/bin/openqa-review-daily-email 2021-06-28 14:56:08.000000000 +0200 @@ -6,6 +6,7 @@ fi openqa_host="${openqa_host:-"https://openqa.suse.de"}" +html_report_host="${html_report_host:-"https://w3.nue.suse.com/~okurz"}" recv="${recv:-"openqa-suse-status(a)suse.de"}" html_target_file="${html_target_file:-"openqa_suse_de_status.html"}" html_target="${html_target:-"/suse/okurz/Export/${html_target_file}"}" @@ -23,7 +24,7 @@ # We have to preserve the '$@' until here to prevent too early evaluation of parameters with spaces save_report="$(${openqa_review} ${openqa_review_args} ${openqa_review_save_args} "$@")" email_report="$(${openqa_review} $openqa_review_args $openqa_review_email_args "$@")" -(echo -e "This is an automated message generated by 'openqa-review', see https://github.com/os-autoinst/openqa_review for details. An HTML version of this report is available on https://w3.nue.suse.com/~okurz/${html_target_file}. Status of tests and builds on ${openqa_host} as of $(date --iso-8601='seconds'):\n" && \ +(echo -e "This is an automated message generated by 'openqa-review', see https://github.com/os-autoinst/openqa_review for details. An HTML version of this report is available on ${html_report_host}/${html_target_file}. Status of tests and builds on ${openqa_host} as of $(date --iso-8601='seconds'):\n" && \ echo "$email_report" && \ echo -e "\nAny feedback regarding the script processing or contact can be communicated using issues on the github repo or directly to okurz(a)suse.de\n\nRegards,\nYour openqa_review") | mutt -s "Daily status from ${openqa_host}" -e 'my_hdr From: openqa-review <okurz(a)suse.de>' $recv ++++++ python-openqa_review.obsinfo ++++++ --- /var/tmp/diff_new_pack.Ah5pcn/_old 2021-06-29 22:43:41.862908323 +0200 +++ /var/tmp/diff_new_pack.Ah5pcn/_new 2021-06-29 22:43:41.862908323 +0200 @@ -1,5 +1,5 @@ name: python-openqa_review -version: 1.24.0 -mtime: 1624640498 -commit: a9f2c8ab55c6a42338acbbef284cab30f01e1814 +version: 1.25.0 +mtime: 1624884968 +commit: 6b5eaa5b7a637599eb8628341ae1a33507f60454

1 0

commit sigil for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sigil for openSUSE:Factory checked in at 2021-06-29 22:42:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sigil (Old) and /work/SRC/openSUSE:Factory/.sigil.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sigil" Tue Jun 29 22:42:59 2021 rev:20 rq:902802 version:1.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sigil/sigil.changes 2021-06-01 10:41:13.381197265 +0200 +++ /work/SRC/openSUSE:Factory/.sigil.new.2625/sigil.changes 2021-06-29 22:43:39.058904622 +0200 @@ -1,0 +2,5 @@ +Mon Jun 28 10:53:29 UTC 2021 - ecsos <ecsos(a)opensuse.org> + +- Fix dependencies (Drop Qt5Webkit and Qt5WebKitWidgets). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sigil.spec ++++++ --- /var/tmp/diff_new_pack.gYKz4O/_old 2021-06-29 22:43:39.638905387 +0200 +++ /var/tmp/diff_new_pack.gYKz4O/_new 2021-06-29 22:43:39.638905387 +0200 @@ -79,13 +79,13 @@ BuildRequires: zlib-devel BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Multimedia) +BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(Qt5WebChannel) -#BuildRequires: pkgconfig(Qt5WebKit) BuildRequires: pkgconfig(Qt5WebEngine) -BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5XmlPatterns) BuildRequires: pkgconfig(hunspell)

1 0

commit kphotoalbum for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kphotoalbum for openSUSE:Factory checked in at 2021-06-29 22:42:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kphotoalbum (Old) and /work/SRC/openSUSE:Factory/.kphotoalbum.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kphotoalbum" Tue Jun 29 22:42:58 2021 rev:10 rq:902787 version:5.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kphotoalbum/kphotoalbum.changes 2020-08-28 21:21:26.920326749 +0200 +++ /work/SRC/openSUSE:Factory/.kphotoalbum.new.2625/kphotoalbum.changes 2021-06-29 22:43:38.406903761 +0200 @@ -1,0 +2,35 @@ +Sun Jun 27 11:01:13 UTC 2021 - Wolfgang Bauer <wbauer(a)tmo.at> + +- Update to 5.8.1 + * Enhancement: The "Copy to/Move to" action (triggered by + pressing F7/F8) can now be run both from the browser and the + viewer, using the same interface and caching the same last + target directory + * Change: Search field no longer gets focus by default (you can + press '/' to focus) + * Enhancement: Improve focus switching behavior when using + Tab/Shift-Tab + * Enhancement: Add freeform text search to thumbnail view + (kde#321502) + * Enhancement: UI improvements for MapView + * Enhancement: Performance improvement when many thumbnails are + shown in the MapView + * Enhancement: Allow relative local URLs in "Open list of files" + dialog + * Enhancement: Add option "--vacuum" to kpa-thumbnailtool + * Bugfix: Fix searching for label (introduced in version 5.4.1) + * Bugfix: Make splash screen text readable with dark themes + * Bugfix: Fix crash in context menu of full-screen preview of + annotation dialog + * Change: Start maximized on first startup + * Change: Click behavior for overview page now honors + system-preference for double- or single-click +- Drop Fix-build-with-Qt-versions-before-5.12.patch, merged + upstream + +------------------------------------------------------------------- +Thu Aug 27 12:27:04 UTC 2020 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Spec cleanup + +------------------------------------------------------------------- Old: ---- Fix-build-with-Qt-versions-before-5.12.patch kphotoalbum-5.7.0.tar.xz New: ---- kphotoalbum-5.8.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kphotoalbum.spec ++++++ --- /var/tmp/diff_new_pack.W15ytF/_old 2021-06-29 22:43:38.858904358 +0200 +++ /var/tmp/diff_new_pack.W15ytF/_new 2021-06-29 22:43:38.862904363 +0200 @@ -1,7 +1,7 @@ # # spec file for package kphotoalbum # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,13 @@ Name: kphotoalbum -Version: 5.7.0 +Version: 5.8.1 Release: 0 Summary: A photo administration utility License: GPL-2.0-or-later Group: Productivity/Graphics/Viewers URL: https://www.kphotoalbum.org/ Source: https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM -Patch: Fix-build-with-Qt-versions-before-5.12.patch BuildRequires: cmake >= 3.3.0 BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -50,6 +48,7 @@ BuildRequires: cmake(Phonon4Qt5) BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5Sql) +BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) >= 5.9.0 BuildRequires: cmake(Qt5Xml) Requires: sqlite3 @@ -64,35 +63,37 @@ %lang_package %prep -%setup -q -%autopatch -p1 +%autosetup -p1 %build %cmake_kf5 -d build -%make_jobs +%cmake_build %install %kf5_makeinstall -C build + %find_lang %{name} -%kf5_find_htmldocs +%{kf5_find_htmldocs} + %suse_update_desktop_file org.kde.%{name} Graphics Photography %suse_update_desktop_file org.kde.%{name}-import Graphics Photography %fdupes -s %{buildroot} %files -%license COPYING +%license LICENSES/* %doc ChangeLog README.md %{_kf5_applicationsdir}/* +%{_kf5_appstreamdir}/org.kde.kphotoalbum.appdata.xml %{_kf5_bindir}/* -%{_kf5_iconsdir}/hicolor/*/*/*.png %{_kf5_configdir}/kphotoalbumrc %{_kf5_htmldir}/en/kphotoalbum/ +%{_kf5_iconsdir}/hicolor/*/*/*.png %{_kf5_kxmlguidir}/kphotoalbum/ %{_kf5_libdir}/libkpabase.so +%{_kf5_libdir}/libkpaexif.so %{_kf5_libdir}/libkpathumbnails.so %{_kf5_sharedir}/kphotoalbum/ -%{_kf5_appstreamdir}/org.kde.kphotoalbum.appdata.xml %files lang -f %{name}.lang ++++++ kphotoalbum-5.7.0.tar.xz -> kphotoalbum-5.8.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kphotoalbum/kphotoalbum-5.7.0.tar.xz /work/SRC/openSUSE:Factory/.kphotoalbum.new.2625/kphotoalbum-5.8.1.tar.xz differ: char 26, line 1

1 0

commit umbrello for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package umbrello for openSUSE:Factory checked in at 2021-06-29 22:42:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/umbrello (Old) and /work/SRC/openSUSE:Factory/.umbrello.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "umbrello" Tue Jun 29 22:42:53 2021 rev:103 rq:902751 version:21.04.2 Changes: -------- --- /work/SRC/openSUSE:Factory/umbrello/umbrello.changes 2021-06-12 20:10:27.569180181 +0200 +++ /work/SRC/openSUSE:Factory/.umbrello.new.2625/umbrello.changes 2021-06-29 22:43:00.174853301 +0200 @@ -1,0 +2,6 @@ +Mon Jun 28 07:46:19 UTC 2021 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Add patch to get rid of the QtWebKit dependency: + * 0001-Make-QtWebKit-usage-in-WelcomePage-optional-with-QTe.patch + +------------------------------------------------------------------- New: ---- 0001-Make-QtWebKit-usage-in-WelcomePage-optional-with-QTe.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ umbrello.spec ++++++ --- /var/tmp/diff_new_pack.H9Xsas/_old 2021-06-29 22:43:01.082854499 +0200 +++ /var/tmp/diff_new_pack.H9Xsas/_new 2021-06-29 22:43:01.086854505 +0200 @@ -32,6 +32,8 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{ve… Source2: applications.keyring %endif +# PATCH-FIX-UPSTREAM +Patch0: 0001-Make-QtWebKit-usage-in-WelcomePage-optional-with-QTe.patch BuildRequires: extra-cmake-modules BuildRequires: kdevelop5-pg-qt BuildRequires: kdevplatform-devel @@ -60,7 +62,6 @@ BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5WebKitWidgets) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) Recommends: %{name}-lang ++++++ 0001-Make-QtWebKit-usage-in-WelcomePage-optional-with-QTe.patch ++++++ From bc20a61b530b39a4a0dde9fd69a46fb4b3f27585 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <asturm(a)gentoo.org> Date: Mon, 12 Oct 2020 11:46:24 +0200 Subject: [PATCH] Make QtWebKit usage in WelcomePage optional, with QTextBrowser fallback Thanks-to: Ralf Habacker <ralf.habacker(a)freenet.de> for QTextBrowser fallback code. Signed-off-by: Andreas Sturmlechner <asturm(a)gentoo.org> --- CMakeLists.txt | 7 ++++++- cmake/modules/ECMKDE4Macros.cmake | 7 ++++++- umbrello/CMakeLists.txt | 8 ++++++-- umbrello/umlappprivate.h | 13 +++++++++++++ unittests/CMakeLists.txt | 1 - 5 files changed, 31 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d98036c..59873cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,9 +102,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Test Widgets Xml - WebKitWidgets ) +find_package(Qt5WebKitWidgets ${QT_MIN_VERSION}) +if(Qt5WebKitWidgets_FOUND) + add_definitions(-DWEBKIT_WELCOMEPAGE) + set(WEBKIT_WELCOMEPAGE 1) +endif() + # search packages used by KDE find_package(KF5 REQUIRED COMPONENTS Archive diff --git a/cmake/modules/ECMKDE4Macros.cmake b/cmake/modules/ECMKDE4Macros.cmake index 3de4722..e1a31b4 100644 --- a/cmake/modules/ECMKDE4Macros.cmake +++ b/cmake/modules/ECMKDE4Macros.cmake @@ -106,7 +106,12 @@ macro(find_package package) #message("-- ${ARGV} --") if("${package}" MATCHES "^(Qt5)") #message("-- replaced by finding Qt4 --") - _find_package(Qt4 4.4.3 REQUIRED QtCore QtGui QtXml QtTest QtWebKit) + _find_package(Qt4 4.4.3 REQUIRED QtCore QtGui QtXml QtTest) + _find_package(Qt4QtWebKit 4.4.3) + if(Qt4QtWebKit_FOUND) + add_definitions(-DWEBKIT_WELCOMEPAGE) + set(WEBKIT_WELCOMEPAGE 1) + endif() elseif("${package}" MATCHES "^(KF5)$") #message("-- replaced by finding KDE4 --") _find_package(KDE4 REQUIRED) diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt index 4a21685..56ae7d8 100644 --- a/umbrello/CMakeLists.txt +++ b/umbrello/CMakeLists.txt @@ -525,13 +525,15 @@ if(NOT BUILD_KF5) Qt4::QtCore Qt4::QtGui Qt4::QtXml - Qt4::QtWebKit ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KFILE_LIBS} codeimport ) + if(WEBKIT_WELCOMEPAGE) + target_link_libraries(libumbrello Qt4::QtWebKit) + endif() kde4_add_app_icon(umbrello_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/global/hi*-apps-umbrello.png") kde4_add_executable(umbrello ${umbrello_SRCS}) @@ -549,7 +551,6 @@ else() Qt5::Xml Qt5::PrintSupport Qt5::Svg - Qt5::WebKitWidgets KF5::Archive KF5::Completion KF5::CoreAddons @@ -565,6 +566,9 @@ else() ${LIBXML2_LIBRARIES} codeimport ) + if(WEBKIT_WELCOMEPAGE) + target_link_libraries(libumbrello Qt5::WebKitWidgets) + endif() ecm_add_app_icon(umbrello_SRCS ICONS ${CMAKE_CURRENT_SOURCE_DIR}/pics/global/16-apps-umbrello.png diff --git a/umbrello/umlappprivate.h b/umbrello/umlappprivate.h index a85de1f..a7212cc 100644 --- a/umbrello/umlappprivate.h +++ b/umbrello/umlappprivate.h @@ -42,7 +42,11 @@ #include <QFileInfo> #include <QListWidget> #include <QObject> +#ifdef WEBKIT_WELCOMEPAGE #include <QWebView> +#else +#include <QTextBrowser> +#endif class QWidget; @@ -160,6 +164,7 @@ public slots: // qDebug() << html; welcomeWindow = new QDockWidget(i18n("Welcome"), parent); welcomeWindow->setObjectName(QLatin1String("WelcomeDock")); +#ifdef WEBKIT_WELCOMEPAGE QWebView *view = new QWebView; view->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); view->setContextMenuPolicy(Qt::NoContextMenu); @@ -167,6 +172,14 @@ public slots: view->setHtml(html); view->show(); welcomeWindow->setWidget(view); +#else + QTextBrowser *tb = new QTextBrowser(dynamic_cast<QWidget*>(this)); + tb->setOpenExternalLinks(true); + tb->setOpenLinks(false); + tb->setHtml(html); + connect(tb, SIGNAL(anchorClicked(const QUrl)), this, SLOT(slotWelcomeWindowLinkClicked(const QUrl))); + welcomeWindow->setWidget(tb); +#endif parent->addDockWidget(Qt::RightDockWidgetArea, welcomeWindow); viewWelcomeWindow = parent->actionCollection()->add<KToggleAction>(QLatin1String("view_show_welcome")); diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index 08cd43a..e96659f 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -60,7 +60,6 @@ else() Qt5::Xml Qt5::Test Qt5::Widgets - Qt5::WebKitWidgets KF5::I18n KF5::Crash ${LIBXML2_LIBRARIES} -- 2.32.0

1 0

commit kreport for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kreport for openSUSE:Factory checked in at 2021-06-29 22:42:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kreport (Old) and /work/SRC/openSUSE:Factory/.kreport.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kreport" Tue Jun 29 22:42:52 2021 rev:9 rq:902879 version:3.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kreport/kreport.changes 2020-06-17 14:57:30.554454570 +0200 +++ /work/SRC/openSUSE:Factory/.kreport.new.2625/kreport.changes 2021-06-29 22:42:57.410849653 +0200 @@ -1,0 +2,21 @@ +Mon Jun 28 14:47:16 UTC 2021 - Wolfgang Bauer <wbauer(a)tmo.at> + +- Add Requires: cmake(Qt5Qml) to the devel package to fix kexi's + build on ppc + +------------------------------------------------------------------- +Mon Jun 28 07:13:37 UTC 2021 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Remove the optional QtWebKit build dependency. + +------------------------------------------------------------------- +Tue Apr 20 13:52:12 UTC 2021 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Spec cleanup + +------------------------------------------------------------------- +Thu Aug 27 12:50:01 UTC 2020 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Spec cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kreport.spec ++++++ --- /var/tmp/diff_new_pack.Rp1mdm/_old 2021-06-29 22:42:58.898851617 +0200 +++ /var/tmp/diff_new_pack.Rp1mdm/_new 2021-06-29 22:42:58.902851622 +0200 @@ -1,7 +1,7 @@ # # spec file for package kreport # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,19 +28,18 @@ # PATCH-FIX-UPSTREAM Patch0: Fix-kexi-build-with-GCC-10.patch BuildRequires: extra-cmake-modules -BuildRequires: kproperty-devel BuildRequires: python-base BuildRequires: update-desktop-files BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5GuiAddons) BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(KPropertyCore) BuildRequires: cmake(Marble) BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt5Qml) -BuildRequires: cmake(Qt5WebKitWidgets) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) Recommends: %{name}-lang @@ -59,7 +58,8 @@ %package devel Summary: Development package for KReport Group: Development/Libraries/KDE -Requires: kproperty-devel +Requires: cmake(KPropertyCore) +Requires: cmake(Qt5Qml) Requires: libKReport3-%{sover} = %{version} %description devel @@ -68,19 +68,18 @@ %lang_package %prep -%setup -q -%autopatch -p1 +%autosetup -p1 %build %cmake_kf5 -d build -%make_jobs +%cmake_build %install - %kf5_makeinstall -C build - %find_lang %{name} %{name}.lang --all-name --with-qt +%kf5_makeinstall -C build +%find_lang %{name} %{name}.lang --all-name --with-qt - # The pkgconfig files contain incorrect stuff - rm -f %{buildroot}%{_libdir}/pkgconfig/KReport3.pc +# The pkgconfig files contain incorrect stuff +rm %{buildroot}%{_libdir}/pkgconfig/KReport3.pc %post -n libKReport3-%{sover} -p /sbin/ldconfig %postun -n libKReport3-%{sover} -p /sbin/ldconfig @@ -90,16 +89,15 @@ %{_libdir}/libKReport3.so.* %files -%{_datadir}/kreport3/ -%{_kf5_servicetypesdir}/kreport_elementplugin.desktop %{_kf5_plugindir}/kreport3/ +%{_kf5_servicetypesdir}/kreport_elementplugin.desktop +%{_kf5_sharedir}/kreport3/ %files devel %license COPYING* %{_includedir}/KReport3/ -%{_libdir}/cmake/KReport3/ -%{_libdir}/libKReport3.so -#%%{_libdir}/pkgconfig/KReport3.pc +%{_kf5_cmakedir}/KReport3/ +%{_kf5_libdir}/libKReport3.so %{_kf5_mkspecsdir}/qt_KReport3.pri %files lang -f %{name}.lang

1 0

commit kexi for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kexi for openSUSE:Factory checked in at 2021-06-29 22:42:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kexi (Old) and /work/SRC/openSUSE:Factory/.kexi.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kexi" Tue Jun 29 22:42:51 2021 rev:11 rq:902811 version:3.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kexi/kexi.changes 2021-04-29 01:39:04.922636408 +0200 +++ /work/SRC/openSUSE:Factory/.kexi.new.2625/kexi.changes 2021-06-29 22:42:56.838848898 +0200 @@ -1,0 +2,11 @@ +Mon Jun 28 11:39:36 UTC 2021 - Wolfgang Bauer <wbauer(a)tmo.at> + +- BuildRequire postgresql-server-devel also on Leap 15.2/15.3 to + fix missing PostgreSQL migration driver + +------------------------------------------------------------------- +Mon Jun 28 07:16:57 UTC 2021 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Remove the optional QtWebKit dependency. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kexi.spec ++++++ --- /var/tmp/diff_new_pack.BBMCng/_old 2021-06-29 22:42:57.286849489 +0200 +++ /var/tmp/diff_new_pack.BBMCng/_new 2021-06-29 22:42:57.290849494 +0200 @@ -38,6 +38,7 @@ BuildRequires: kreport-devel BuildRequires: libmysqld-devel BuildRequires: mysql-devel +BuildRequires: postgresql-server-devel BuildRequires: update-desktop-files BuildRequires: cmake(KF5Archive) BuildRequires: cmake(KF5Codecs) @@ -62,8 +63,6 @@ BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5UiTools) -BuildRequires: cmake(Qt5WebKit) -BuildRequires: cmake(Qt5WebKitWidgets) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) # For dir ownership @@ -74,13 +73,8 @@ Provides: calligra-kexi = %{version} # not ported yet Obsoletes: calligra-kexi-spreadsheet-import < %{version} -%if 0%{?suse_version} > 1500 -BuildRequires: postgresql-server-devel -%else -BuildRequires: postgresql-devel -%endif # Kexi needs breeze-icons.rcc during build and on runtime (it doesn't start without it installed) -%if 0%{?suse_version} > 1500 || "%{?_repository}" == "KDE_Applications_openSUSE_Leap_15.1" || "%{?_repository}" == "KDE_Applications_openSUSE_Leap_15.2" +%if 0%{?suse_version} > 1500 || "%{?_repository}" == "KDE_Applications_openSUSE_Leap_15.2" || "%{?_repository}" == "KDE_Applications_openSUSE_Leap_15.3" BuildRequires: breeze5-icons-rcc Requires: breeze5-icons-rcc %else

1 0

commit gpsbabel for openSUSE:Factory
by Source-Sync 29 Jun '21

29 Jun '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gpsbabel for openSUSE:Factory checked in at 2021-06-29 22:42:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpsbabel (Old) and /work/SRC/openSUSE:Factory/.gpsbabel.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gpsbabel" Tue Jun 29 22:42:50 2021 rev:35 rq:902700 version:1.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gpsbabel/gpsbabel.changes 2020-02-04 19:53:25.561324146 +0100 +++ /work/SRC/openSUSE:Factory/.gpsbabel.new.2625/gpsbabel.changes 2021-06-29 22:42:54.746846137 +0200 @@ -1,0 +2,28 @@ +Sun Jun 27 12:56:37 UTC 2021 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Remove the unneeded QtWebKit build dependency. + +------------------------------------------------------------------- +Mon May 31 17:38:51 UTC 2021 - tom stevens <tsteven4(a)gmail.com> + +- Update to 1.7.0 +- Replace 0003-gpsbabel-1.4.3-gmapbase.patch with + 0003-gpsbabel-1.7.0-gmapbase.patch +- Added patches + * 0009-PR611-system-libs.patch + This adds configurability of libraries to the qmake build. + It is from upstream pull request 611. + * 0010-translations.patch + This allows gpsbabelfe to find the translation files. +- Obsolete patches + * 0002-gpsbabel-1.4.3-use-system-shapelib.patch + * 0006-Use-system-zlib.patch + * 0007-Use-system-minizip.patch + * 0008-Fix-QString-casting-build-failures.patch +- Update build system + * use qmake to build client. Upstream is dropping support for configure. +- Fix packging + * include missing translation files + * use correct version of pdf documentation + +------------------------------------------------------------------- @@ -291 +318,0 @@ - Old: ---- 0002-gpsbabel-1.4.3-use-system-shapelib.patch 0003-gpsbabel-1.4.3-gmapbase.patch 0006-Use-system-zlib.patch 0007-Use-system-minizip.patch 0008-Fix-QString-casting-build-failures.patch gpsbabel-1.5.0.pdf gpsbabel-1.5.4.tar.gz New: ---- 0003-gpsbabel-1.7.0-gmapbase.patch 0009-PR611-system-libs.patch 0010-translations.patch gpsbabel-1.7.0.pdf gpsbabel_1_7_0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpsbabel.spec ++++++ --- /var/tmp/diff_new_pack.rraVBM/_old 2021-06-29 22:42:55.946847721 +0200 +++ /var/tmp/diff_new_pack.rraVBM/_new 2021-06-29 22:42:55.950847726 +0200 @@ -1,7 +1,7 @@ # # spec file for package gpsbabel # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,43 +18,36 @@ %global translationdir %{_datadir}/qt5/translations Name: gpsbabel -Version: 1.5.4 +Version: 1.7.0 Release: 0 Summary: Converts GPS waypoint, route and track data from one format type to another License: GPL-2.0-or-later Group: Hardware/Other URL: http://www.gpsbabel.org/ -Source: %{name}-%{version}.tar.gz -Source1: http://www.gpsbabel.org/htmldoc-1.5.0/%{name}-1.5.0.pdf +Source: https://github.com/GPSBabel/gpsbabel/archive/refs/tags/%{name}_1_7_0.tar.gz +Source1: http://www.gpsbabel.org/htmldoc-%{version}/%{name}-%{version}.pdf Source2: %{name}.png Source21: style3.css -# Use system shapelib - not suitable for upstream in this form. -Patch2: 0002-gpsbabel-1.4.3-use-system-shapelib.patch # Pickup gmapbase.html from /usr/share/gpsbabel -Patch3: 0003-gpsbabel-1.4.3-gmapbase.patch +Patch3: 0003-gpsbabel-1.7.0-gmapbase.patch # No automatic phone home by default (RHBZ 668865) Patch4: 0004-gpsbabel-1.4.3-nosolicitation.patch -# Use system zlib -Patch6: 0006-Use-system-zlib.patch -# Use system minizip -Patch7: 0007-Use-system-minizip.patch -# Fix build failures due to implicit QString casting -Patch8: 0008-Fix-QString-casting-build-failures.patch -BuildRequires: autoconf +# Add qmake support for system libraries. +Patch9: 0009-PR611-system-libs.patch +# Pickup translations from /usr/share/qt5/translations +Patch10: 0010-translations.patch BuildRequires: libqt5-qtbase-devel -BuildRequires: libusb-devel -BuildRequires: minizip-devel +BuildRequires: libusb-1_0-devel BuildRequires: pkgconfig -BuildRequires: shapelib-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Designer) BuildRequires: pkgconfig(Qt5Help) BuildRequires: pkgconfig(Qt5UiTools) +BuildRequires: pkgconfig(Qt5WebChannel) BuildRequires: pkgconfig(Qt5WebEngineWidgets) -BuildRequires: pkgconfig(Qt5WebKit) -BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(shapelib) BuildRequires: pkgconfig(zlib) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -80,42 +73,28 @@ Group: Hardware/Other Requires: %{name} = %{version}-%{release} Requires(post): update-desktop-files -Requires(postun): update-desktop-files +Requires(postun):update-desktop-files %description gui Qt GUI interface for GPSBabel %prep -%setup -q +%autosetup -p1 -n gpsbabel-gpsbabel_1_7_0 # Use system shapelib instead of bundled partial shapelib rm -rf shapelib -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 # Get rid of bundled zlib -# configure --with-zlib=system is not enough, -# building still accesses bundled zlib headers rm -rf zlib/* -touch zlib/empty.in cp -p %{SOURCE21} gpsbabel.org-style3.css -# Avoid calling autoconf from Makefile -touch -r configure.in configure Makefile.in - # Fixup categories for .desktop file sed -i \ -e 's:Utility;::g' \ gui/gpsbabel.desktop %build -export CXXFLAGS="%{optflags} -fPIC" -%configure\ - --with-zlib=system +%qmake5 PREFIX=%{_prefix} WITH_LIBUSB=system WITH_SHAPELIB=pkgconfig WITH_ZLIB=pkgconfig make %{?_smp_mflags} cp %{SOURCE1} %{name}.pdf @@ -131,11 +110,14 @@ make -C gui DESTDIR=%{buildroot} install -install -m 0755 -p gui/objects/gpsbabelfe-bin %{buildroot}/%{_bindir} +install -m 0755 -d %{buildroot}/%{_bindir} +install -m 0755 -p gpsbabel %{buildroot}/%{_bindir} +install -m 0755 -p gui/objects/gpsbabelfe %{buildroot}/%{_bindir} install -m 0755 -d %{buildroot}/%{_datadir}/%{name} install -m 0644 -p gui/gmapbase.html %{buildroot}/%{_datadir}/%{name}/ install -m 0755 -d %{buildroot}/%{translationdir} -install -m 0644 -p gui/gpsbabel*_*.qm %{buildroot}/%{translationdir}/ +install -m 0644 -p gui/gpsbabelfe_*.qm %{buildroot}/%{translationdir}/ +install -m 0644 -p gui/coretool/gpsbabel_*.qm %{buildroot}/%{translationdir}/ install -m 0755 -d %{buildroot}/%{_datadir}/applications install -m 0644 gui/gpsbabel.desktop %{buildroot}/%{_datadir}/applications @@ -155,9 +137,10 @@ %files %defattr(-,root,root) -%doc AUTHORS COPYING README* %{name}.pdf +%doc AUTHORS README* %{name}.pdf +%license COPYING %{_bindir}/gpsbabel -%{_bindir}/gpsbabelfe-bin +%{_bindir}/gpsbabelfe %{_datadir}/applications/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* ++++++ 0003-gpsbabel-1.4.3-gmapbase.patch -> 0003-gpsbabel-1.7.0-gmapbase.patch ++++++ --- /work/SRC/openSUSE:Factory/gpsbabel/0003-gpsbabel-1.4.3-gmapbase.patch 2015-06-02 10:04:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gpsbabel.new.2625/0003-gpsbabel-1.7.0-gmapbase.patch 2021-06-29 22:42:54.650846010 +0200 @@ -1,38 +1,25 @@ -From 563b847b51bd225df3585b9740fa6f678fb2f26d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu(a)fedoraproject.org> -Date: Tue, 15 Apr 2014 05:20:16 +0200 -Subject: [PATCH 3/6] gpsbabel-1.4.3-gmapbase - - Pickup gmapbase.html from /usr/share/gpsbabel. ---- - gui/map.cc | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - diff --git a/gui/map.cc b/gui/map.cc -index 3284376..dc8cec8 100644 +index a55c752e..d8656c97 100644 --- a/gui/map.cc +++ b/gui/map.cc -@@ -34,6 +34,10 @@ +@@ -44,6 +44,10 @@ + #include <vector> #include "appname.h" - #include "dpencode.h" +#ifndef PKGDATADIR +#define PKGDATADIR "/usr/share/gpsbabel" +#endif + - //------------------------------------------------------------------------ - static QString stripDoubleQuotes(const QString s) { - QString out; -@@ -60,7 +64,8 @@ Map::Map(QWidget *parent, - connect(this,SIGNAL(loadFinished(bool)), - this,SLOT(loadFinishedX(bool))); - this->logTimeX("Start map constuctor"); + using std::string; + using std::vector; + +@@ -90,7 +94,8 @@ Map::Map(QWidget* parent, + connect(mclicker, SIGNAL(logTime(QString)), this, SLOT(logTime(QString))); + #endif + - QString baseFile = QApplication::applicationDirPath() + "/gmapbase.html"; + QString baseFile = PKGDATADIR; + baseFile += "/gmapbase.html"; if (!QFile(baseFile).exists()) { - QMessageBox::critical(0, appName, - tr("Missing \"gmapbase.html\" file. Check installation")); --- -2.1.0 - + QMessageBox::critical(nullptr, appName, + tr("Missing \"gmapbase.html\" file. Check installation")); ++++++ 0009-PR611-system-libs.patch ++++++ ++++ 714 lines (skipped) ++++++ 0010-translations.patch ++++++ diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc index 22b2b449..f0f1fde4 100644 --- a/gui/mainwindow.cc +++ b/gui/mainwindow.cc @@ -71,6 +71,10 @@ #include "version_mismatch.h" // for VersionMismatch +#ifndef DATADIR +#define DATADIR "/usr/share" +#endif + const int BabelData::noType_ = -1; const int BabelData::fileType_ = 0; @@ -219,8 +223,8 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) ui_.outputWindow->setReadOnly(true); - langPath_ = QApplication::applicationDirPath(); - langPath_.append("/translations/"); + langPath_ = DATADIR; + langPath_.append("/qt5/translations/"); // Start up in the current system language. loadLanguage(QLocale::system().name()); ++++++ gpsbabel-1.5.0.pdf -> gpsbabel-1.7.0.pdf ++++++ (binary differes)

1 0