On Fri, October 7, 2022 02:59, Antoine Jacoutot wrote: > It?s pretty rare that intltool is used with meson. Most of the time you want > gettext,-tools. > Could you check if this is the case here. > Thanks.
Hi, Thanks for the hint. Updated diff without intltool dep and gettext-,tools added as a BDEP. Also fixed mandir path. > > ? > Antoine > >> On 6 Oct 2022, at 18:04, Kirill Bychkov <[email protected]> wrote: >> >> ?Hi, >> Attached patch updates geeqie to the latest 2.0.1 version. >> Main portwise change is that upstream switched fgo autotools to meson. >> I'm also taking maintainer. >> OK? >> >> Index: Makefile >> =================================================================== >> RCS file: /cvs/ports/graphics/geeqie/Makefile,v >> retrieving revision 1.34 >> diff -u -p -u -p -r1.34 Makefile >> --- Makefile 26 Jul 2022 06:24:48 -0000 1.34 >> +++ Makefile 6 Oct 2022 20:43:20 -0000 >> @@ -1,27 +1,28 @@ >> COMMENT= lightweight Gtk+3 based image viewer >> >> -V= 1.7.3 >> +V= 2.0.1 >> DISTNAME= geeqie-${V} >> EXTRACT_SUFX= .tar.xz >> CATEGORIES= graphics >> -REVISION= 0 >> EPOCH= 0 >> >> HOMEPAGE= https://www.geeqie.org/ >> >> +MAINTAINER= Kirill Bychkov <[email protected]> >> + >> # GPLv2+ >> PERMIT_PACKAGE= Yes >> >> -WANTLIB += ${COMPILER_LIBCXX} atk-1.0 c cairo cairo-gobject exiv2 >> -WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 >> -WANTLIB += gtk-3 harfbuzz heif intl jpeg lcms2 m openjp2 pango-1.0 >> +WANTLIB += ${COMPILER_LIBCXX} c cairo exiv2 >> +WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 >> +WANTLIB += gtk-3 heif intl jpeg lcms2 m openjp2 pango-1.0 >> WANTLIB += pangocairo-1.0 raw tiff >> >> COMPILER= base-clang ports-gcc base-gcc >> >> MASTER_SITES= >> https://github.com/BestImageViewer/geeqie/releases/download/v${V}/ >> >> -MODULES= textproc/intltool >> +MODULES= devel/meson textproc/intltool >> >> RUN_DEPENDS= devel/desktop-file-utils \ >> devel/xdg-utils \ >> @@ -34,40 +35,20 @@ LIB_DEPENDS= graphics/exiv2 \ >> multimedia/libheif \ >> x11/gtk+3 >> >> -USE_GMAKE= Yes >> - >> -CONFIGURE_STYLE= autoreconf >> -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ >> - LDFLAGS="-L${LOCALBASE}/lib" >> -CONFIGURE_ARGS= --disable-doxygen-doc \ >> - --disable-doxygen-html \ >> - --disable-archive \ >> - --disable-lirc \ >> - --disable-lua \ >> - --disable-ffmpegthumbnailer \ >> - --disable-gpu-accel \ >> - --disable-pdf \ >> - --disable-djvu \ >> - --disable-webp \ >> - --enable-gtk3 \ >> - --with-htmldir=${PREFIX}/share/doc/geeqie \ >> - --with-readmedir=${PREFIX}/share/doc/geeqie >> - >> -AUTOCONF_VERSION= 2.71 >> -AUTOMAKE_VERSION= 1.16 >> -AUTORECONF= ./autogen.sh >> -MAKE_ENV= MKDIR_P='mkdir -p' >> - >> -# XXX >> -# lxml.ElementInclude.FatalIncludeError: cannot load >> 'GuideMainWindowFilePane.xml' as 'xml' >> -CONFIGURE_ENV += ac_cv_path_GNOME_DOC_TOOL= >> - >> -SEPARATE_BUILD= Yes >> +CONFIGURE_ARGS+= -Darchive=disabled \ >> + -Ddjvu=disabled \ >> + -Dgps-map=disabled \ >> + -Djpegxl=disabled \ >> + -Dlua=disabled \ >> + -Dpdf=disabled \ >> + -Dspell=disabled \ >> + -Dvideothumbnailer=disabled \ >> + -Dwebp=disabled \ >> + -Dgq_htmldir=${PREFIX}/share/doc/geeqie \ >> + -Dgq_helpdir=${PREFIX}/share/doc/geeqie >> >> post-extract: >> sed -i 's,bash,sh,g' ${WRKSRC}/version.sh >> - sed -i 's,./create-doxygen-lua-api.sh,,' ${WRKSRC}/doc/Makefile.am >> - sed -i 's,-Werror ,,g' ${WRKSRC}/configure.ac >> >> post-install: >> rm -r ${PREFIX}/share/doc/ >> Index: distinfo >> =================================================================== >> RCS file: /cvs/ports/graphics/geeqie/distinfo,v >> retrieving revision 1.9 >> diff -u -p -u -p -r1.9 distinfo >> --- distinfo 25 Jul 2022 07:33:01 -0000 1.9 >> +++ distinfo 6 Oct 2022 20:43:20 -0000 >> @@ -1,2 +1,2 @@ >> -SHA256 (geeqie-1.7.3.tar.xz) = JbH3HPkb2alvOZ0qnnBQflS7N3pW5k2JUhwPepzl3Tg= >> -SIZE (geeqie-1.7.3.tar.xz) = 1949696 >> +SHA256 (geeqie-2.0.1.tar.xz) = icGnV0z+OIiXLRByP0zzonckm+pJT9nGMKqNDflEVV0= >> +SIZE (geeqie-2.0.1.tar.xz) = 1666600 >> Index: patches/patch-Makefile_am >> =================================================================== >> RCS file: patches/patch-Makefile_am >> diff -N patches/patch-Makefile_am >> --- patches/patch-Makefile_am 11 Mar 2022 19:22:21 -0000 1.4 >> +++ /dev/null 1 Jan 1970 00:00:00 -0000 >> @@ -1,26 +0,0 @@ >> -Index: Makefile.am >> ---- Makefile.am.orig >> -+++ Makefile.am >> -@@ -10,9 +10,9 @@ man_MANS = geeqie.1 >> - readmedir = @readmedir@ >> - >> - if HAVE_MARKDOWN >> --readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS >> README.html ChangeLog.html >> -+readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html >> - else >> --readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS >> ChangeLog.html >> -+readme_DATA = README.md COPYING TODO README.lirc AUTHORS >> - endif >> - >> - desktopdir = $(datadir)/applications >> -@@ -47,10 +47,6 @@ dist-hook: geeqie.spec >> - >> - DISTCLEANFILES = config.report >> - CLEANFILES = $(desktop_DATA) ChangeLog.html $(appdata_DATA) >> -- >> --.PHONY: ChangeLog >> --ChangeLog.html: >> -- ./gen_changelog.sh >> - >> - README.html: README.md >> - ./gen_readme.sh >> Index: patches/patch-config_h_in >> =================================================================== >> RCS file: patches/patch-config_h_in >> diff -N patches/patch-config_h_in >> --- /dev/null 1 Jan 1970 00:00:00 -0000 >> +++ patches/patch-config_h_in 6 Oct 2022 20:43:20 -0000 >> @@ -0,0 +1,13 @@ >> +Index: config.h.in >> +--- config.h.in.orig >> ++++ config.h.in >> +@@ -160,9 +160,6 @@ >> + /* Define to 1 if you have the <string.h> header file. */ >> + #define HAVE_STRING_H 1 >> + >> +-/* Define to 1 if you have the `strverscmp' function. */ >> +-#define HAVE_STRVERSCMP 1 >> +- >> + /* Define to 1 if you have the <sys/stat.h> header file. */ >> + #define HAVE_SYS_STAT_H 1 >> + >> Index: patches/patch-meson_build >> =================================================================== >> RCS file: patches/patch-meson_build >> diff -N patches/patch-meson_build >> --- /dev/null 1 Jan 1970 00:00:00 -0000 >> +++ patches/patch-meson_build 6 Oct 2022 20:43:20 -0000 >> @@ -0,0 +1,21 @@ >> +Index: meson.build >> +--- meson.build.orig >> ++++ meson.build >> +@@ -119,7 +119,7 @@ desktopdir = join_paths(datadir, meson.project_name(), >> + helpdir = join_paths(prefix, gq_helpdir) >> + htmldir = join_paths(prefix, gq_htmldir) >> + icondir = join_paths(datadir, 'pixmaps') >> +-mandir1 = join_paths(datadir, 'man', 'man1') >> ++mandir1 = join_paths(prefix, 'man', 'man1') >> + >> + podir = join_paths(meson.source_root(), 'po') >> + >> +@@ -401,7 +401,7 @@ endif >> + tiff_dep = [] >> + option = get_option('tiff') >> + if not option.disabled() >> +- tiff_dep = cc.find_library('libtiff', required: get_option('tiff')) >> ++ tiff_dep = dependency('libtiff-4', required: get_option('tiff')) >> + if tiff_dep.found() >> + if cc.has_function('TIFFClientOpen', dependencies : tiff_dep) >> + conf_data.set('HAVE_TIFF', 1) >> Index: patches/patch-src_advanced_exif_c >> =================================================================== >> RCS file: patches/patch-src_advanced_exif_c >> diff -N patches/patch-src_advanced_exif_c >> --- patches/patch-src_advanced_exif_c 25 Jul 2022 07:33:01 -0000 1.1 >> +++ /dev/null 1 Jan 1970 00:00:00 -0000 >> @@ -1,33 +0,0 @@ >> -Upstream commit 5ef5596d879a28a9876271fb2d54e1021430aba7 >> - >> -Index: src/advanced_exif.c >> ---- src/advanced_exif.c.orig >> -+++ src/advanced_exif.c >> -@@ -280,18 +280,25 @@ void advanced_exif_close(ExifWin *ew) >> - if (!ew) return; >> - >> - advanced_exif_window_get_geometry(ew); >> -+ file_data_unref(ew->fd); >> - >> - gtk_widget_destroy(ew->window); >> -+ >> -+ g_free(ew); >> - } >> - >> --static void advanced_exif_delete_cb(GtkWidget *widget, GdkEvent *event, >> gpointer data) >> -+static gboolean advanced_exif_delete_cb(GtkWidget *widget, GdkEvent >> *event, >> gpointer data) >> - { >> - ExifWin *ew = data; >> - >> -- advanced_exif_window_get_geometry(ew); >> -+ if (!ew) return FALSE; >> - >> -+ advanced_exif_window_get_geometry(ew); >> - file_data_unref(ew->fd); >> -+ >> - g_free(ew); >> -+ >> -+ return FALSE; >> - } >> - >> - static gint advanced_exif_sort_cb(GtkTreeModel *model, GtkTreeIter *a, >> GtkTreeIter *b, gpointer data) >> Index: patches/patch-src_layout_util_c >> =================================================================== >> RCS file: /cvs/ports/graphics/geeqie/patches/patch-src_layout_util_c,v >> retrieving revision 1.3 >> diff -u -p -u -p -r1.3 patch-src_layout_util_c >> --- patches/patch-src_layout_util_c 25 Jul 2022 07:33:01 -0000 1.3 >> +++ patches/patch-src_layout_util_c 6 Oct 2022 20:43:20 -0000 >> @@ -1,5 +1,3 @@ >> -Second chunk upstream commit 5ef5596d879a28a9876271fb2d54e1021430aba7 >> - >> Index: src/layout_util.c >> --- src/layout_util.c.orig >> +++ src/layout_util.c >> @@ -11,17 +9,3 @@ Index: src/layout_util.c >> #include "main.h" >> #include "layout_util.h" >> >> -@@ -4167,10 +4167,12 @@ void layout_bars_close(LayoutWindow *lw) >> - layout_bar_close(lw); >> - } >> - >> --static void layout_exif_window_destroy(GtkWidget *widget, gpointer data) >> -+static gboolean layout_exif_window_destroy(GtkWidget *widget, gpointer >> data) >> - { >> - LayoutWindow *lw = data; >> - lw->exif_window = NULL; >> -+ >> -+ return TRUE; >> - } >> - >> - void layout_exif_window_new(LayoutWindow *lw) >
geeqie-2.0.1.diff
Description: Binary data
