Landry Breuil <[email protected]> writes:
> Le Tue, Nov 16, 2021 at 02:23:38PM +0100, Omar Polo a écrit :
>> Hello,
>>
>> This updates poedit to the latest release. The changelog is:
>>
>> - [macOS] Full support for macOS 11 Big Sur and Apple Silicon (M1).
>> - Completely reworked welcome screen.
>> - Modernized user interface and icons.
>> - Much improved opening of recently edited files.
>> - Automatic reloading of files modified outside of Poedit.
>> - Completely new source code occurrences viewers with syntax
>> highlighting for virtually all programming languages used with
>> gettext.
>> - Editing area now indicates source and translation string lengths.
>> - Full python-format support for PO files.
>> - Further improvements to XLIFF handling.
>>
>> https://github.com/vslavik/poedit/releases/tag/v3.0-oss
>>
>> Runs and builds fine, portcheck and port-lib-depends-check are happy.
>> While here I've also added a comment about the required C++ version.
>>
>> One funny change is that now during the install it calls
>> gtk-update-icon-cache... I can patch that out but to avoid regenerating
>> all the autoconf stuff I'm just @commenting that entry in the plist.
>> (upstream is aware but thinks it's fine[0].) This is done only if
>> gtk-update-icon-cache is found, so I haven't added x11/gkt3 as BDEP,
>> since we're ignoring its output anyway.
>
> well, there's a @tag gtk-update-icon-cache %D/share/icons/hicolor that
> takes care of this ... i think to be cleaner it should be patched out,
> you can patch it out from the Makefile.in files to avoid regenerating
> all autohell.
yep, fortunately this was easy :)
>> Please note that it requires the wxWidgets-webkit subpackage that was
>> committed some hours ago.
>
> i think you should make sure that it depends on the correct version
> then, using wxWidgets->=3.0.5.1p1.
my reasoning was that since the -webkit package is new then the explicit
versioning wasn't needed. I've re-added the version check thought.
> looking at this, i noticed that your commit to add wxWidgets-webkit
> subpackage doesnt set PKGNAME-webkit so it ends up as a FLAVOR in the
> PKGNAME ? not sure that's expected ...
>
> [16:28] c64:/usr/ports/x11/wxWidgets/ $make show=PKGNAMES
> wxWidgets-gtk3-3.0.5.1p1 debug-wxWidgets-gtk3-3.0.5.1p1
> wxWidgets-media-3.0.5.1p0 debug-wxWidgets-media-3.0.5.1p0
> wxWidgets-3.0.5.1-webkit debug-wxWidgets-3.0.5.1-webkit
>
> (yes, PSEUDO_FLAVORS and MULTI_PACKAGES are hard)
Thanks for spotting the PKGNAME error! It should be fixed by now :)
> Landry
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/poedit/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile 10 Sep 2021 13:46:28 -0000 1.36
+++ Makefile 17 Nov 2021 17:22:43 -0000
@@ -2,10 +2,9 @@
COMMENT= cross-platform gettext catalogs (PO-files) editor
-V= 2.4.3
+V= 3.0
DISTNAME= poedit-${V}
CATEGORIES= devel
-REVISION= 0
HOMEPAGE= https://www.poedit.net/
@@ -19,10 +18,10 @@ WANTLIB += atk-1.0 boost_regex-mt boost_
WANTLIB += cairo cairo-gobject enchant-2 gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 gtkspell3-3 harfbuzz icudata
WANTLIB += icui18n icuuc intl lucene++ pango-1.0 pangocairo-1.0 pugixml
-WANTLIB += wx_gtk3u_stc-3.0 wx_baseu-3.0 wx_baseu_net-3.0
-WANTLIB += wx_baseu_xml-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_core-3.0
-WANTLIB += wx_gtk3u_html-3.0 wx_gtk3u_xrc-3.0
+WANTLIB += wx_baseu-3.0 wx_baseu_net-3.0 wx_baseu_xml-3.0 wx_gtk3u_adv-3.0
+WANTLIB += wx_gtk3u_core-3.0 wx_gtk3u_xrc-3.0 wx_gtk3u_webview-3.0
+# C++14
COMPILER= base-clang ports-gcc base-gcc
RUN_DEPENDS= devel/desktop-file-utils \
@@ -31,7 +30,7 @@ RUN_DEPENDS= devel/desktop-file-utils \
LIB_DEPENDS= textproc/gtkspell3 \
textproc/luceneplusplus \
textproc/pugixml \
- x11/wxWidgets>=2.6.3
+ x11/wxWidgets,-webkit>=3.0.5.1
CONFIGURE_STYLE=gnu
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/devel/poedit/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 28 Apr 2021 15:08:40 -0000 1.8
+++ distinfo 29 Oct 2021 15:08:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (poedit-2.4.3.tar.gz) = ZgH13e61ruCmaHr3hn6fiPaYnnBQE3pCExtqwWwO/YQ=
-SIZE (poedit-2.4.3.tar.gz) = 2916410
+SHA256 (poedit-3.0.tar.gz) = 375ejF6m42/UcvwpTyzt+ARlb1LbNy6j+75BAxNrLcI=
+SIZE (poedit-3.0.tar.gz) = 2925483
Index: patches/patch-artwork_Makefile_in
===================================================================
RCS file: patches/patch-artwork_Makefile_in
diff -N patches/patch-artwork_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-artwork_Makefile_in 17 Nov 2021 16:27:55 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+don't update the gtk icon cache
+
+Index: artwork/Makefile.in
+--- artwork/Makefile.in.orig
++++ artwork/Makefile.in
+@@ -729,7 +729,7 @@ uninstall-am: uninstall-dist_appicons128DATA \
+
+
+ update-icon-cache:
+- which gtk-update-icon-cache >/dev/null && gtk-update-icon-cache -f -t
$(DESTDIR)$(iconsdir) || true
++ true
+
+ install-data-hook: update-icon-cache
+ uninstall-hook: update-icon-cache
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/devel/poedit/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 23 Aug 2020 06:35:02 -0000 1.10
+++ pkg/PLIST 17 Nov 2021 16:28:29 -0000
@@ -3,12 +3,12 @@
@man man/man1/poedit.1
share/applications/net.poedit.Poedit.desktop
share/applications/net.poedit.PoeditURI.desktop
+share/icons/hicolor/128x128/apps/net.poedit.Poedit.png
share/icons/hicolor/16x16/apps/net.poedit.Poedit.png
share/icons/hicolor/24x24/apps/net.poedit.Poedit.png
-share/icons/hicolor/256x256/apps/net.poedit.Poedit.png
share/icons/hicolor/32x32/apps/net.poedit.Poedit.png
share/icons/hicolor/48x48/apps/net.poedit.Poedit.png
-share/icons/hicolor/512x512/apps/net.poedit.Poedit.png
+share/icons/hicolor/scalable/apps/net.poedit.Poedit.svg
share/locale/af/LC_MESSAGES/poedit.mo
share/locale/an/LC_MESSAGES/poedit.mo
share/locale/ar/LC_MESSAGES/poedit.mo
@@ -83,7 +83,6 @@ share/poedit/icons/DownvoteTemplate.png
share/poedit/icons/ExtractorsGNUgettext.png
share/poedit/icons/ItemBookmarkTemplate.png
share/poedit/icons/ItemCommentTemplate.png
-share/poedit/icons/PoeditWelcome.png
share/poedit/icons/StatusError.png
share/poedit/icons/StatusErrorBlack.png
share/poedit/icons/StatusWarning.png
@@ -91,11 +90,8 @@ share/poedit/icons/StatusWarningBlack.pn
share/poedit/icons/SuggestionErrorTemplate.png
share/poedit/icons/SuggestionPerfectMatch.png
share/poedit/icons/SuggestionTMTemplate.png
-share/poedit/icons/document-new.png
share/poedit/icons/document-open.png
-share/poedit/icons/document-properties.png
share/poedit/icons/document-save.png
-share/poedit/icons/edit-delete.png
share/poedit/icons/hicolor/
share/poedit/icons/hicolor/scalable/
share/poedit/icons/hicolor/scalable/actions/
