From 88eaaa609e860cd94f6f96180c8fd7b3fc3de357 Mon Sep 17 00:00:00 2001 From: teldra Date: Sun, 11 Aug 2019 14:31:06 +0200 Subject: [PATCH] libfm: switch to gtk+3 --- common/shlibs | 2 +- srcpkgs/{libfm-gtk => libfm-gtk+3} | 0 .../{libfm-gtk-devel => libfm-gtk+3-devel} | 0 srcpkgs/libfm/template | 28 ++++++++++--------- 4 files changed, 16 insertions(+), 14 deletions(-) rename srcpkgs/{libfm-gtk => libfm-gtk+3} (100%) rename srcpkgs/{libfm-gtk-devel => libfm-gtk+3-devel} (100%) diff --git a/common/shlibs b/common/shlibs index 131f15608f..77427f34ab 100644 --- a/common/shlibs +++ b/common/shlibs @@ -914,7 +914,7 @@ libgupnp-dlna-1.0.so.2 gupnp-dlna-0.6.1_1 libtracker-common.so libtracker-2.2.0_1 libtracker-data.so libtracker-2.2.0_1 libfm.so.4 libfm-1.2.3_3 -libfm-gtk.so.4 libfm-gtk-1.2.4_2 +libfm-gtk3.so.4 libfm-gtk+3-1.3.1_2 libfm-extra.so.4 libfm-extra-1.2.3_3 libunique-1.0.so.0 libunique1-1.1.6_1 libxnoise.so.0 libxnoise-0.1.29_1 diff --git a/srcpkgs/libfm-gtk b/srcpkgs/libfm-gtk+3 similarity index 100% rename from srcpkgs/libfm-gtk rename to srcpkgs/libfm-gtk+3 diff --git a/srcpkgs/libfm-gtk-devel b/srcpkgs/libfm-gtk+3-devel similarity index 100% rename from srcpkgs/libfm-gtk-devel rename to srcpkgs/libfm-gtk+3-devel diff --git a/srcpkgs/libfm/template b/srcpkgs/libfm/template index 623e952776..9ee5e9ab8d 100644 --- a/srcpkgs/libfm/template +++ b/srcpkgs/libfm/template @@ -4,12 +4,12 @@ # pkgname=libfm version=1.3.1 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--enable-udisks --disable-static" -hostmakedepends="automake gettext-devel glib-devel gtk-doc intltool libtool +configure_args="--enable-udisks --disable-static --with-gtk=3" +hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config vala-devel" -makedepends="dbus-glib-devel gtk+-devel libexif-devel menu-cache-devel" +makedepends="dbus-glib-devel gtk+3-devel libexif-devel menu-cache-devel" depends="libfm-extra>=${version}" short_desc="Core library of PCManFM file manager" maintainer="Juan RP " @@ -44,11 +44,12 @@ libfm-devel_package() { } } -libfm-gtk_package() { - short_desc+=" - GTK+ library" +libfm-gtk+3_package() { + short_desc+=" - GTK+3 library" + replaces="libfm-gtk>=0" pkg_install() { vmove usr/bin - vmove usr/lib/libfm-gtk.so.* + vmove usr/lib/libfm-gtk3.so.* vmove usr/lib/libfm/modules/gtk-*.so vmove usr/share/applications vmove usr/share/libfm/images @@ -57,12 +58,13 @@ libfm-gtk_package() { } } -libfm-gtk-devel_package() { - depends="gtk+-devel - libfm-devel>=${version}_${revision} libfm-gtk>=${version}_${revision}" - short_desc+=" - GTK+ library (development files)" +libfm-gtk+3-devel_package() { + depends="gtk+3-devel + libfm-devel>=${version}_${revision} libfm-gtk+3>=${version}_${revision}" + short_desc+=" - GTK+3 library (development files)" + replaces="libfm-gtk-devel>=0" pkg_install() { - vmove usr/lib/libfm-gtk.so - vmove usr/lib/pkgconfig/libfm-gtk.pc + vmove usr/lib/libfm-gtk3.so + vmove usr/lib/pkgconfig/libfm-gtk3.pc } }