Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mp for openSUSE:Factory checked in at 2025-05-30 14:38:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mp (Old) and /work/SRC/openSUSE:Factory/.mp.new.25440 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mp" Fri May 30 14:38:12 2025 rev:5 rq:1281172 version:5.62 Changes: -------- --- /work/SRC/openSUSE:Factory/mp/mp.changes 2024-12-04 15:27:44.050762323 +0100 +++ /work/SRC/openSUSE:Factory/.mp.new.25440/mp.changes 2025-05-30 17:24:02.552066595 +0200 @@ -1,0 +2,17 @@ +Wed May 28 15:49:58 UTC 2025 - Friedrich Haubensak <hs...@mail.de> + +- Update to 5.62 +- See RELEASE_NOTES for notes on releases since 5.31, and + mp-5.62-releasenotes.patch for notes on releases prior to 5.31 +- Drop mp-docdir.patch, add mp-5.62-installdirs.patch +- Drop mp-scrollevent.patch, upstreamed +- Drop desktop and icon source files in favour of upstream + provided files +- Add mp-5.62-config-msgfmt.patch to fix install of lang files +- To build docs and man page, add grutatxt and mp_doccer, add + mp-5.62-mpdm-config.patch, mp-5.62-mpsl-make-quickref.patch +- Qt5 is EOL, replace Qt5Widgets by Qt6Widgets: add + mp-5.62-config-qt6.patch, mp-5.62-qt6-isnull.patch, + mp-5.62-qt6-weight.patch + +------------------------------------------------------------------- Old: ---- mp-5-gtk3.desktop mp-5.2.13.tar.gz mp-5.2.13.tar.gz.asc mp-5.desktop mp-5.png mp-docdir.patch mp-scrollevent.patch mp.keyring New: ---- grutatxt.tar.gz mp-5.62-config-msgfmt.patch mp-5.62-config-qt6.patch mp-5.62-installdirs.patch mp-5.62-mpdm-config.patch mp-5.62-mpsl-make-quickref.patch mp-5.62-qt6-isnull.patch mp-5.62-qt6-weight.patch mp-5.62-releasenotes.patch mp-5.62.tar.gz mp_doccer-1.2.2.tar.gz BETA DEBUG BEGIN: Old: mp-5.62-releasenotes.patch for notes on releases prior to 5.31 - Drop mp-docdir.patch, add mp-5.62-installdirs.patch - Drop mp-scrollevent.patch, upstreamed Old:- Drop mp-docdir.patch, add mp-5.62-installdirs.patch - Drop mp-scrollevent.patch, upstreamed - Drop desktop and icon source files in favour of upstream BETA DEBUG END: BETA DEBUG BEGIN: New: provided files - Add mp-5.62-config-msgfmt.patch to fix install of lang files - To build docs and man page, add grutatxt and mp_doccer, add New:- Qt5 is EOL, replace Qt5Widgets by Qt6Widgets: add mp-5.62-config-qt6.patch, mp-5.62-qt6-isnull.patch, mp-5.62-qt6-weight.patch New: mp-5.62-releasenotes.patch for notes on releases prior to 5.31 - Drop mp-docdir.patch, add mp-5.62-installdirs.patch - Drop mp-scrollevent.patch, upstreamed New:- To build docs and man page, add grutatxt and mp_doccer, add mp-5.62-mpdm-config.patch, mp-5.62-mpsl-make-quickref.patch - Qt5 is EOL, replace Qt5Widgets by Qt6Widgets: add New:- To build docs and man page, add grutatxt and mp_doccer, add mp-5.62-mpdm-config.patch, mp-5.62-mpsl-make-quickref.patch - Qt5 is EOL, replace Qt5Widgets by Qt6Widgets: add New:- Qt5 is EOL, replace Qt5Widgets by Qt6Widgets: add mp-5.62-config-qt6.patch, mp-5.62-qt6-isnull.patch, mp-5.62-qt6-weight.patch New: mp-5.62-config-qt6.patch, mp-5.62-qt6-isnull.patch, mp-5.62-qt6-weight.patch New:- See RELEASE_NOTES for notes on releases since 5.31, and mp-5.62-releasenotes.patch for notes on releases prior to 5.31 - Drop mp-docdir.patch, add mp-5.62-installdirs.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mp.spec ++++++ --- /var/tmp/diff_new_pack.rSEIMr/_old 2025-05-30 17:24:03.196093342 +0200 +++ /var/tmp/diff_new_pack.rSEIMr/_new 2025-05-30 17:24:03.200093508 +0200 @@ -1,7 +1,7 @@ # # spec file for package mp # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,25 +17,27 @@ Name: mp -Version: 5.2.13 +Version: 5.62 Release: 0 Summary: A text editor for programmers License: GPL-2.0-only URL: https://triptico.com/software/mp.html -Source0: mp-%{version}.tar.gz -Source1: mp-%{version}.tar.gz.asc -Source2: %{name}.keyring -Source3: %{name}-5.desktop -Source4: %{name}-5.png +Source0: https://github.com/ttcdt/mp-5.x/archive/refs/tags/%{version}.tar.gz#/mp-%{version}.tar.gz Source5: %{name}-rpmlintrc -Source6: %{name}-5-gtk3.desktop -Patch0: %{name}-docdir.patch -Patch1: %{name}-scrollevent.patch +Source101: https://triptico.com/download/grutatxt.tar.gz +Source102: https://triptico.com/download/mp_doccer-1.2.2.tar.gz +Patch2: mp-5.62-releasenotes.patch +Patch3: mp-5.62-installdirs.patch +Patch4: mp-5.62-config-msgfmt.patch +Patch5: mp-5.62-mpdm-config.patch +Patch6: mp-5.62-mpsl-make-quickref.patch +Patch7: mp-5.62-config-qt6.patch +Patch8: mp-5.62-qt6-isnull.patch +Patch9: mp-5.62-qt6-weight.patch BuildRequires: fdupes BuildRequires: ncurses-devel BuildRequires: pkgconfig -BuildRequires: update-desktop-files -BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt6Widgets) BuildRequires: pkgconfig(gtk+-3.0) %description @@ -101,28 +103,41 @@ * It helps you abandon vi, emacs and other six-legged freaks definitely. %prep -%autosetup -p1 +## helper tools needed to build docs and man page +%setup -q -T -c -n helpers -a 101 +cd .. +%setup -q -T -D -c -n helpers -a 102 +cd .. +mv helpers/Grutatxt*/{Grutatxt.pm,grutatxt} helpers/mp_doccer*/mp_doccer helpers +sed -e "s:use lib '.':use lib '%{_builddir}/helpers':" -i helpers/grutatxt + +%autosetup -p1 -n mp-5.x-%{version} %build +## nneded for Qt6, see qt6-base / qt6-core-devel +%if 0%{?suse_version} == 1500 +export CC=gcc-13 +export CPP=g++-13 +%endif export CFLAGS="%{optflags}" -./config.sh --prefix=%{_prefix} --docdir=%{_docdir}/mp-5 +export PATH=${PATH}:%{_builddir}/helpers +./config.sh --prefix=%{_prefix} --docdir=%{_docdir}/mp-5 --with-moc=%{_libexecdir}/qt6/moc %make_build mv mp-5 mp-5-qt5 -WITHOUT_QT5=1 WITHOUT_QT4=1 ./config.sh --prefix=%{_prefix} --docdir=%{_docdir}/mp-5 +WITHOUT_MSGFMT=0 WITHOUT_QT5=1 ./config.sh --prefix=%{_prefix} --docdir=%{_docdir}/mp-5 %make_build +%make_build docs +sed -e 's/^Exec=mp-5/&-gtk3/' -e 's/^Name=.*/& (GTK+3 version)/' <minimum-profit.desktop >minimum-profit.desktop-gtk3 mv mp-5 mp-5-gtk3 mv mp-5-qt5 mp-5 %install -%make_install +%make_install install-arch +%make_install -C mpsl -install -D -p -m 644 %{SOURCE3} %{buildroot}/%{_datadir}/applications/%{name}-5.desktop -install -D -p -m 644 %{SOURCE4} %{buildroot}/%{_datadir}/pixmaps/%{name}-5.png -install -p -m 644 %{SOURCE6} %{buildroot}/%{_datadir}/applications/%{name}-5-gtk3.desktop install -m 755 mp-5-gtk3 %{buildroot}%{_bindir}/mp-5-gtk3 install -m 644 mp-5.1 %{buildroot}/%{_mandir}/man1/mp-5-gtk3.1 - -%suse_update_desktop_file %{name}-5 TextEditor +install -m 644 minimum-profit.desktop-gtk3 %{buildroot}/%{_datadir}/applications/minimum-profit-gtk3.desktop %find_lang minimum-profit rm %{buildroot}%{_docdir}/mp-5/mpsl_quickref.ps @@ -136,11 +151,12 @@ %{_mandir}/man1/%{name}-5.1%{?ext_man} %dir %{_datadir}/%{name}-5 %{_datadir}/%{name}-5/* -%{_datadir}/applications/%{name}-5.desktop -%{_datadir}/pixmaps/%{name}-5.png +%{_datadir}/applications/minimum-profit.desktop +%{_datadir}/icons/hicolor/48x48/apps/* +%{_datadir}/metainfo/* %files gtk3 %{_bindir}/%{name}-5-gtk3 -%{_datadir}/applications/%{name}-5-gtk3.desktop +%{_datadir}/applications/minimum-profit-gtk3.desktop %{_mandir}/man1/%{name}-5-gtk3.1%{?ext_man} ++++++ mp-5.62-config-msgfmt.patch ++++++ fix unconditional setting of WITHOUT_MSGFMT that results in always building without msgfmt --- a/config.sh 2024-12-07 08:52:47.000000000 +0100 +++ b/config.sh 2025-05-27 13:20:44.129796033 +0200 @@ -25,7 +25,7 @@ WITHOUT_KDE4=1 # No msgfmt by default -WITHOUT_MSGFMT=1 +WITHOUT_MSGFMT=${WITHOUT_MSGFMT:=1} WITH_EXTERNAL_ARCH=0 ++++++ mp-5.62-config-qt6.patch ++++++ Qt5 is out of support as of 2025-05-26. usage of Qt in mp sources seems simple enough to just replace Qt5Widgets by Qt6Widgets. Older Qt6Widgets.pc files are missing "Requires: Qt6Core Qt6Gui". --- a/config.sh 2024-12-07 08:52:47.000000000 +0100 +++ b/config.sh 2025-05-26 10:23:37.309979419 +0200 @@ -449,10 +449,10 @@ if [ "$WITHOUT_QT5" = "1" ] ; then echo "Disabled" else - if chk_pkgconfig Qt5Widgets + if chk_pkgconfig Qt6Widgets then - TMP_CFLAGS="$(${PKG_CONFIG} --cflags Qt5Widgets 2>/dev/null) -fPIC" - TMP_LDFLAGS="$(${PKG_CONFIG} --libs Qt5Widgets 2>/dev/null)" + TMP_CFLAGS="$(${PKG_CONFIG} --cflags Qt6Widgets Qt6Core Qt6Gui 2>/dev/null) -fPIC" + TMP_LDFLAGS="$(${PKG_CONFIG} --libs Qt6Widgets Qt6Core Qt6Gui 2>/dev/null)" if USE_CXX=true chk_compiles "$(cat <<EOF #include <QtWidgets> ++++++ mp-5.62-installdirs.patch ++++++ fix / adapt installation directories to opensuse habits --- a/makefile.in 2024-12-07 08:52:47.000000000 +0100 +++ b/makefile.in 2025-05-26 13:26:01.945038290 +0200 @@ -141,22 +141,24 @@ install -m 644 $(ARCH_FILE) $(PREFIX)/share/$(APPNAME)/ || true install: $(INSTALL_MSG) installdoc $(INSTALLMO) $(MORE_INSTALL_TARGETS) + ./mkinstalldirs -m 755 $(PREFIX)/bin install -m 755 $(APPNAME) $(PREFIX)/bin/$(APPNAME) - ./mkinstalldirs $(PREFIX)/share/man/man1 + ./mkinstalldirs -m 755 $(PREFIX)/share/man/man1 [ -f $(APPNAME).1 ] && install -m 644 $(APPNAME).1 $(PREFIX)/share/man/man1/$(APPNAME).1 || true - [ -d /usr/share/applications ] && install -m 644 minimum-profit.desktop /usr/share/applications || true - [ -d /usr/share/metainfo ] && install -m 644 metainfo.xml /usr/share/metainfo/com.triptico.minimum_profit.metainfo.xml || true - [ -d /usr/share/icons/hicolor/48x48/apps/ ] && install -m 644 minimum-profit.png /usr/share/icons/hicolor/48x48/apps/ || true + ./mkinstalldirs -m 755 $(PREFIX)/share/applications + install -m 644 minimum-profit.desktop $(PREFIX)/share/applications + ./mkinstalldirs -m 755 $(PREFIX)/share/metainfo + install -m 644 metainfo.xml $(PREFIX)/share/metainfo/com.triptico.minimum_profit.metainfo.xml + ./mkinstalldirs -m 755 $(PREFIX)/share/icons/hicolor/48x48/apps + install -m 644 minimum-profit.png $(PREFIX)/share/icons/hicolor/48x48/apps installdoc: - ./mkinstalldirs $(PREFIX)/share/doc/$(APPNAME) - chmod 755 $(PREFIX)/share/doc/ - chmod 755 $(PREFIX)/share/doc/$(APPNAME) + ./mkinstalldirs -m 755 $(PREFIX)/share/doc/packages/$(APPNAME) ( cd $(MPDM); $(MAKE) installdoc ) ( cd $(MPSL); $(MAKE) installdoc ) - install -m 644 doc/* $(PREFIX)/share/doc/$(APPNAME) - install -m 644 $(ADD_DOCS) $(PREFIX)/share/doc/$(APPNAME) - [ -f doc/mp_index.html ] && install -m 644 doc/mp_index.html $(PREFIX)/share/doc/$(APPNAME)/index.html || true + install -m 644 doc/* $(PREFIX)/share/doc/packages/$(APPNAME) + install -m 644 $(ADD_DOCS) $(PREFIX)/share/doc/packages/$(APPNAME) + [ -f doc/mp_index.html ] && install -m 644 doc/packages/mp_index.html $(PREFIX)/share/doc/packages/$(APPNAME)/index.html || true uninstall: $(UNINSTALLMO) rm -f $(PREFIX)/bin/$(APPNAME) ++++++ mp-5.62-mpdm-config.patch ++++++ fix failing mp_doccer detection --- a/mpdm/config.sh 2024-12-07 08:52:47.000000000 +0100 +++ b/mpdm/config.sh 2025-05-26 22:59:11.465842766 +0200 @@ -657,7 +657,7 @@ # test for mp_doccer echo -n "Testing if mp_doccer is installed... " -MP_DOCCER=$(which mp_doccer > /dev/null 2>&1||which mp-doccer > /dev/null 2>&1) +MP_DOCCER=$(which mp_doccer 2>/dev/null || which mp-doccer 2>/dev/null) if [ $? = 0 ] ; then ++++++ mp-5.62-mpsl-make-quickref.patch ++++++ fix building of doc/mpsl_quickref.ps, and add it to docsclean target --- a/mpsl/makefile.in 2024-12-07 08:52:47.000000000 +0100 +++ b/mpsl/makefile.in 2025-05-26 17:09:43.643633225 +0200 @@ -78,7 +78,7 @@ .txt.html: grutatxt < $< > $@ -doc/mpsl_quickref.ps: doc/mpsl_quickref.txt +doc/mpsl_quickref.ps: doc/mpsl_quickref.txt mpsl -./mpsl scripts/mkquickref.mpsl < doc/mpsl_quickref.txt > $@ doc/mpsl_api.txt: mpsl_c.c mpsl.y @@ -96,7 +96,7 @@ docs: $(DOCS) docsclean: - rm -f $(MP_DOCCER_DOCS) doc/*.html + rm -f $(MP_DOCCER_DOCS) doc/*.html doc/*.ps distcopy: distclean mkdir -p $(DIST_TARGET) ; \ ++++++ mp-5.62-qt6-isnull.patch ++++++ fix test that still worked in Qt5 but does not in Qt6 --- a/mpv_qk_common.cpp 2024-12-07 08:52:47.000000000 +0100 +++ b/mpv_qk_common.cpp 2025-05-26 10:39:15.220655492 +0200 @@ -70,7 +70,7 @@ { mpdm_t r = NULL; - if (s != NULL) { + if (!s.isNull()) { int t = s.size(); wchar_t *wptr = (wchar_t *) calloc((t + 1), sizeof(wchar_t)); ++++++ mp-5.62-qt6-weight.patch ++++++ reflect Qt6 changes to QFont::Weight enumeration and setWeight() --- a/mpv_qk_common.cpp 2024-12-07 08:52:47.000000000 +0100 +++ b/mpv_qk_common.cpp 2025-05-28 16:10:32.584350324 +0200 @@ -168,10 +168,16 @@ else mpdm_set_wcs(c, MPDM_I(font_size), L"font_size"); +#if QT_VERSION_MAJOR<6 +#define WEIGHT_FACTOR 100.0 +#else +#define WEIGHT_FACTOR 1000.0 +#endif + if ((v = mpdm_get_wcs(c, L"font_weight")) != NULL) - font_weight = mpdm_rval(v) * 100.0; + font_weight = mpdm_rval(v) * WEIGHT_FACTOR; else - mpdm_set_wcs(c, MPDM_R(font_weight / 100.0), L"font_weight"); + mpdm_set_wcs(c, MPDM_R(font_weight / WEIGHT_FACTOR), L"font_weight"); if ((v = mpdm_get_wcs(c, L"font_face")) != NULL) { w = mpdm_ref(MPDM_2MBS(mpdm_string(v))); @@ -187,7 +193,14 @@ font->setFixedPitch(true); if (font_weight > 0.0) + { +#if QT_VERSION_MAJOR<6 font->setWeight((int) font_weight); +#else + if (font_weight < 1.0) { font_weight = 1.0; } + font->setWeight(static_cast<QFont::Weight>(font_weight)); +#endif + } mpdm_unref(w); ++++++ mp-5.62-releasenotes.patch ++++++ ++++ 749 lines (skipped) ++++++ mp-5.2.13.tar.gz -> mp-5.62.tar.gz ++++++ ++++ 83047 lines of diff (skipped)
