From 5ffdaf514578bb37ffbe63451e2f37e2ef51200b Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 1 Apr 2023 08:19:09 +0000 Subject: [PATCH] Move to gtk+3. --- x11/libfm/Makefile.inc | 5 ++++- x11/libfm/core/Makefile | 20 ++++++++++--------- .../patch-src_base_fm-thumbnail-loader_c | 14 +++++++++++++ x11/libfm/core/pkg/PLIST | 8 ++++---- x11/libfm/extra/Makefile | 2 +- x11/libfm/extra/pkg/DESCR | 3 +-- x11/pcmanfm/Makefile | 13 ++++++------ 7 files changed, 42 insertions(+), 23 deletions(-) create mode 100644 x11/libfm/core/patches/patch-src_base_fm-thumbnail-loader_c diff --git a/x11/libfm/Makefile.inc b/x11/libfm/Makefile.inc index 60e7e728a9b..c7964aa656b 100644 --- a/x11/libfm/Makefile.inc +++ b/x11/libfm/Makefile.inc @@ -1,10 +1,13 @@ +# this port is split in two to prevent a circular dependency: +# menu-cache -> libfm (though only extra is needed) -> menu-cache + V= 1.3.2 DISTNAME= libfm-${V} EXTRACT_SUFX= .tar.xz # quantum entanglement between core and extra SHARED_LIBS += fm 1.1 # 5.3 -SHARED_LIBS += fm-gtk 1.1 # 5.3 +SHARED_LIBS += fm-gtk3 0.0 # 5.3 SHARED_LIBS += fm-extra 1.1 # 5.3 CATEGORIES += x11 devel diff --git a/x11/libfm/core/Makefile b/x11/libfm/core/Makefile index 401046fb75d..674bd3bcac0 100644 --- a/x11/libfm/core/Makefile +++ b/x11/libfm/core/Makefile @@ -1,14 +1,14 @@ COMMENT= glib/gio-based lib for file management -REVISION= 1 +REVISION= 2 -WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext -WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo exif -WANTLIB += expat ffi fm-extra fontconfig freetype fribidi gdk-x11-2.0 -WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 -WANTLIB += graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz iconv intl -WANTLIB += m menu-cache pango-1.0 pangocairo-1.0 pangoft2-1.0 +WANTLIB += ${COMPILER_LIBCXX} X11 Xau Xcomposite Xcursor Xdamage +WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 +WANTLIB += atk-bridge-2.0 atspi c cairo cairo-gobject dbus-1 epoxy +WANTLIB += execinfo exif expat ffi fm-extra fontconfig freetype +WANTLIB += fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 +WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 harfbuzz iconv +WANTLIB += intl jpeg m menu-cache pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += pcre2-8 pixman-1 png xcb xcb-render xcb-shm z -WANTLIB += Xau Xdmcp jpeg BUILD_DEPENDS= lang/vala @@ -19,7 +19,9 @@ RUN_DEPENDS= devel/desktop-file-utils \ LIB_DEPENDS= graphics/libexif \ x11/libfm/extra \ x11/menu-cache \ - x11/gtk+2 + x11/gtk+3 + +CONFIGURE_ARGS= --with-gtk=3 FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/libfm diff --git a/x11/libfm/core/patches/patch-src_base_fm-thumbnail-loader_c b/x11/libfm/core/patches/patch-src_base_fm-thumbnail-loader_c new file mode 100644 index 00000000000..411503a23f2 --- /dev/null +++ b/x11/libfm/core/patches/patch-src_base_fm-thumbnail-loader_c @@ -0,0 +1,14 @@ +64bit time_t + +Index: src/base/fm-thumbnail-loader.c +--- src/base/fm-thumbnail-loader.c.orig ++++ src/base/fm-thumbnail-loader.c +@@ -882,7 +882,7 @@ static void save_thumbnail_to_disk(ThumbnailTask* task + if(fd != -1) + { + char mtime_str[100]; +- g_snprintf( mtime_str, 100, "%lu", fm_file_info_get_mtime(task->fi)); ++ g_snprintf( mtime_str, 100, "%lld", fm_file_info_get_mtime(task->fi)); + chmod( tmpfile, 0600 ); /* only the owner can read it. */ + backend.set_image_text(pix, "tEXt::Thumb::URI", task->uri); + backend.set_image_text(pix, "tEXt::Thumb::MTime", mtime_str); diff --git a/x11/libfm/core/pkg/PLIST b/x11/libfm/core/pkg/PLIST index 48f29721852..d3ad61fccfe 100644 --- a/x11/libfm/core/pkg/PLIST +++ b/x11/libfm/core/pkg/PLIST @@ -69,9 +69,9 @@ include/libfm-1.0/fm-thumbnailer.h include/libfm-1.0/fm-utils.h include/libfm-1.0/fm.h lib/libfm/ -lib/libfm-gtk.la -@static-lib lib/libfm-gtk.a -@lib lib/libfm-gtk.so.${LIBfm-gtk_VERSION} +@static-lib lib/libfm-gtk3.a +lib/libfm-gtk3.la +@lib lib/libfm-gtk3.so.${LIBfm-gtk3_VERSION} @static-lib lib/libfm.a lib/libfm.la @lib lib/libfm.so.${LIBfm_VERSION} @@ -82,7 +82,7 @@ lib/libfm/modules/ @so lib/libfm/modules/gtk-menu-trash.so @so lib/libfm/modules/vfs-menu.so @so lib/libfm/modules/vfs-search.so -lib/pkgconfig/libfm-gtk.pc +lib/pkgconfig/libfm-gtk3.pc lib/pkgconfig/libfm.pc @man man/man1/libfm-pref-apps.1 @man man/man1/lxshortcut.1 diff --git a/x11/libfm/extra/Makefile b/x11/libfm/extra/Makefile index 3e687333835..4803dd662e5 100644 --- a/x11/libfm/extra/Makefile +++ b/x11/libfm/extra/Makefile @@ -1,7 +1,7 @@ COMMENT= extra library for libfm PKGNAME= libfm-extra-${V} -REVISION= 0 +REVISION= 1 WANTLIB += ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 WANTLIB += iconv intl m pcre2-8 pthread z diff --git a/x11/libfm/extra/pkg/DESCR b/x11/libfm/extra/pkg/DESCR index 97c16572c88..158ec3e194d 100644 --- a/x11/libfm/extra/pkg/DESCR +++ b/x11/libfm/extra/pkg/DESCR @@ -1,2 +1 @@ -Extra library for libfm; split from libfm itself to prevent a circular -dependency with menu-cache. +Extra library for libfm. diff --git a/x11/pcmanfm/Makefile b/x11/pcmanfm/Makefile index 3977ae6c33f..ebddf8dde52 100644 --- a/x11/pcmanfm/Makefile +++ b/x11/pcmanfm/Makefile @@ -2,6 +2,7 @@ COMMENT= fast and lightweight file manager DISTNAME= pcmanfm-1.3.2 EXTRACT_SUFX= .tar.xz +REVISION= 0 CATEGORIES= x11 @@ -12,21 +13,21 @@ MAINTAINER= Antoine Jacoutot # GPLv2 PERMIT_PACKAGE= Yes -WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama -WANTLIB += Xrandr Xrender atk-1.0 c cairo fm fm-gtk fontconfig -WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 -WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 harfbuzz intl m -WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread z +WANTLIB += X11 atk-1.0 c cairo cairo-gobject fm fm-gtk3 gdk-3 +WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 +WANTLIB += gtk-3 harfbuzz intl m pango-1.0 pangocairo-1.0 pthread MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pcmanfm/} MODULES= textproc/intltool -LIB_DEPENDS= x11/libfm/core +LIB_DEPENDS= x11/libfm/core>=1.3.2p2 RUN_DEPENDS= devel/desktop-file-utils CONFIGURE_STYLE= gnu +CONFIGURE_ARGS= --with-gtk=3 + FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/pcmanfm DEBUG_PACKAGES= ${BUILD_PACKAGES}