pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Works, tested with Slackware-current, read TODO, vidthumbnails must be fixed

Module Name:	pkgsrc-wip
Committed By:	andyb <andyb%m42.one@localhost>
Pushed By:	andyb
Date:		Wed Feb 27 15:02:27 2019 +0100
Changeset:	0cff1fe4bdbf723099aa60872dd507f5994908ee

Modified Files:
	spacefm/Makefile
	spacefm/PLIST
	spacefm/distinfo
	spacefm/options.mk

Log Message:
Works, tested with Slackware-current, read TODO, vidthumbnails must be fixed

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0cff1fe4bdbf723099aa60872dd507f5994908ee

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 spacefm/Makefile   | 10 +++----
 spacefm/PLIST      | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 spacefm/distinfo   |  1 +
 spacefm/options.mk | 12 ++------
 4 files changed, 93 insertions(+), 14 deletions(-)

diffs:
diff --git a/spacefm/Makefile b/spacefm/Makefile
index 4f2ef8efa8..d0d6cd37c7 100644
--- a/spacefm/Makefile
+++ b/spacefm/Makefile
@@ -16,11 +16,11 @@ LICENSE=	gnu-gpl-v3
 WRKSRC=		${WRKDIR}/spacefm-1.0.6
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_LANGUAGES=	c c++
-#CC=		gcc $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags glib-2.0) $(pkg-config --cflags gdk)
-#CC=		gcc -I/usr/pkg/include/gtk-3.0/ -I/usr/pkg/include/glib/glib-2.0/
+USE_LANGUAGES=	c
 
-USE_TOOLS+=	intltool msgfmt pkg-config automake autoconf
+CONFIGURE_ARGS+= --disable-video-thumbnails
+
+USE_TOOLS+=	intltool msgfmt pkg-config automake autoconf gmake
 
 DEPENDS+=	libX11-[0-9]*:../../x11/libX11
 DEPENDS+=	hal-[0-9]*:../../sysutils/hal
@@ -30,7 +30,7 @@ DEPENDS+=	ffmpegthumbnailer-[0-9]*:../../multimedia/ffmpegthumbnailer
 
 #edit me
 export LIBUDEV_CFLAGS=	-I/usr/lib/pkgconfig/
-export LIBUDEV_LIBS=	/usr/lib/pkgconfig/
+export LIBUDEV_LIBS=	-L/usr/lib/pkgconfig/
 #edit me
 
 .include "options.mk"
diff --git a/spacefm/PLIST b/spacefm/PLIST
index 48d96a5493..a17753b2c3 100644
--- a/spacefm/PLIST
+++ b/spacefm/PLIST
@@ -1 +1,85 @@
 @comment $NetBSD$
+bin/spacefm
+bin/spacefm-auth
+bin/spacefm-installer
+share/applications/spacefm-find.desktop
+share/applications/spacefm-folder-handler.desktop
+share/applications/spacefm.desktop
+share/doc/spacefm/spacefm-manual-en.html
+share/icons/Faenza/apps/48/spacefm-find.png
+share/icons/Faenza/apps/48/spacefm-root.png
+share/icons/Faenza/apps/48/spacefm.png
+share/icons/hicolor/128x128/apps/spacefm-128-cube-blue.png
+share/icons/hicolor/128x128/apps/spacefm-128-cube-green.png
+share/icons/hicolor/128x128/apps/spacefm-128-cube-red.png
+share/icons/hicolor/128x128/apps/spacefm-128-pyramid-blue.png
+share/icons/hicolor/128x128/apps/spacefm-128-pyramid-green.png
+share/icons/hicolor/128x128/apps/spacefm-128-pyramid-red.png
+share/icons/hicolor/48x48/apps/spacefm-48-cube-blue.png
+share/icons/hicolor/48x48/apps/spacefm-48-cube-green.png
+share/icons/hicolor/48x48/apps/spacefm-48-cube-red.png
+share/icons/hicolor/48x48/apps/spacefm-48-folder-blue.png
+share/icons/hicolor/48x48/apps/spacefm-48-folder-red.png
+share/icons/hicolor/48x48/apps/spacefm-48-pyramid-blue.png
+share/icons/hicolor/48x48/apps/spacefm-48-pyramid-green.png
+share/icons/hicolor/48x48/apps/spacefm-48-pyramid-red.png
+share/icons/hicolor/48x48/apps/spacefm-find.png
+share/icons/hicolor/48x48/apps/spacefm-root.png
+share/icons/hicolor/48x48/apps/spacefm.png
+share/locale/af/LC_MESSAGES/spacefm.mo
+share/locale/ar/LC_MESSAGES/spacefm.mo
+share/locale/bg/LC_MESSAGES/spacefm.mo
+share/locale/bn_IN/LC_MESSAGES/spacefm.mo
+share/locale/ca/LC_MESSAGES/spacefm.mo
+share/locale/cs/LC_MESSAGES/spacefm.mo
+share/locale/da/LC_MESSAGES/spacefm.mo
+share/locale/de/LC_MESSAGES/spacefm.mo
+share/locale/el/LC_MESSAGES/spacefm.mo
+share/locale/es/LC_MESSAGES/spacefm.mo
+share/locale/et/LC_MESSAGES/spacefm.mo
+share/locale/eu/LC_MESSAGES/spacefm.mo
+share/locale/fa/LC_MESSAGES/spacefm.mo
+share/locale/fi/LC_MESSAGES/spacefm.mo
+share/locale/fr/LC_MESSAGES/spacefm.mo
+share/locale/gl/LC_MESSAGES/spacefm.mo
+share/locale/he/LC_MESSAGES/spacefm.mo
+share/locale/hr/LC_MESSAGES/spacefm.mo
+share/locale/hu/LC_MESSAGES/spacefm.mo
+share/locale/id/LC_MESSAGES/spacefm.mo
+share/locale/it/LC_MESSAGES/spacefm.mo
+share/locale/ja/LC_MESSAGES/spacefm.mo
+share/locale/km/LC_MESSAGES/spacefm.mo
+share/locale/ko/LC_MESSAGES/spacefm.mo
+share/locale/lt/LC_MESSAGES/spacefm.mo
+share/locale/ltg/LC_MESSAGES/spacefm.mo
+share/locale/ml/LC_MESSAGES/spacefm.mo
+share/locale/ms/LC_MESSAGES/spacefm.mo
+share/locale/nb/LC_MESSAGES/spacefm.mo
+share/locale/nl/LC_MESSAGES/spacefm.mo
+share/locale/nn/LC_MESSAGES/spacefm.mo
+share/locale/pl/LC_MESSAGES/spacefm.mo
+share/locale/ps/LC_MESSAGES/spacefm.mo
+share/locale/pt/LC_MESSAGES/spacefm.mo
+share/locale/pt_BR/LC_MESSAGES/spacefm.mo
+share/locale/ru/LC_MESSAGES/spacefm.mo
+share/locale/sk/LC_MESSAGES/spacefm.mo
+share/locale/sl/LC_MESSAGES/spacefm.mo
+share/locale/sr/LC_MESSAGES/spacefm.mo
+share/locale/sr@latin/LC_MESSAGES/spacefm.mo
+share/locale/sv/LC_MESSAGES/spacefm.mo
+share/locale/tr/LC_MESSAGES/spacefm.mo
+share/locale/uk/LC_MESSAGES/spacefm.mo
+share/locale/ur/LC_MESSAGES/spacefm.mo
+share/locale/ur_PK/LC_MESSAGES/spacefm.mo
+share/locale/vi/LC_MESSAGES/spacefm.mo
+share/locale/zh_CN/LC_MESSAGES/spacefm.mo
+share/locale/zh_TW/LC_MESSAGES/spacefm.mo
+share/mime/packages/spacefm-mime.xml
+share/spacefm/ui/about-dlg.ui
+share/spacefm/ui/appchooserdlg.ui
+share/spacefm/ui/file_properties.ui
+share/spacefm/ui/find-files.ui
+share/spacefm/ui/find-files2.ui
+share/spacefm/ui/godlg.ui
+share/spacefm/ui/prefdlg.ui
+share/spacefm/ui/prefdlg2.ui
diff --git a/spacefm/distinfo b/spacefm/distinfo
index 245f72c02e..10b72e6c9c 100644
--- a/spacefm/distinfo
+++ b/spacefm/distinfo
@@ -4,3 +4,4 @@ SHA1 (spacefm/1.0.6.tar.gz) = 88b6d4570f2be008c669e667d07ef82c3cf9802e
 RMD160 (spacefm/1.0.6.tar.gz) = 419e8848585b9b75fb40320d8059f8e9f26b2842
 SHA512 (spacefm/1.0.6.tar.gz) = 37fc0dd31f02158502f592415b4c375ee49560af6f03d75b035d7c6c45bdc47064bba1ae8987b4cc8be2e02b3dfcdc17ec760411975e7b5f74343a2293fb2c8c
 Size (spacefm/1.0.6.tar.gz) = 3498587 bytes
+SHA1 (patch-src-main.c) = 5fd3c2183ec73ae972228d4c3d3e9556f1798116
diff --git a/spacefm/options.mk b/spacefm/options.mk
index a88130108f..ffe98b264f 100644
--- a/spacefm/options.mk
+++ b/spacefm/options.mk
@@ -13,13 +13,10 @@ PLIST_VARS+=            gtk3
 .if !empty(PKG_OPTIONS:Mgtk2)
 CONFIGURE_ARGS+=        --with-gtk2
 GTK_CFLAGS=      $(pkg-config --cflags gtk+-2.0)
-GTK_LIBS=        $(pkg-config --libs gtk+-2.0)
-CFLAGS+=          $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags glib-2.0) $(pkg-config --cflags gdk) $(pkg-config --cflags libffmpegthumbnailer)
-LDFLAG+=         $(pkg-config --libs gtk+-2.0) $(pkg-config --libs glib-2.0) $(pkg-config --libs gdk) $(pkg-config --libs libffmpegthumbnailer)
+GTK_LIBS=	$(pkg-config --libs gtk+-2.0)
+CFLAGS+=		-ludev
 export FFMPEG_CFLAGS=   $(pkg-config --cflags libffmpegthumbnailer)
 export FFMPEG_LIBS=     $(pkg-config --libs libffmpegthumbnailer)
-AM_CFLAGS+=      $(pkg-config --cflags gtk+-2.0)
-CPPFLAGS+=       $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags glib-2.0) $(pkg-config --cflags gdk) $(pkg-config --cflags libffmpegthumbnailer)
 
 .include "../../x11/gtk2/buildlink3.mk"
 .endif
@@ -28,12 +25,9 @@ CPPFLAGS+=       $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags glib-2.0)
 CONFIGURE_ARGS+=        --with-gtk3
 GTK_CFLAGS=      $(pkg-config --cflags gtk+-3.0)
 GTK_LIBS=        $(pkg-config --libs gtk+-3.0)
-CFLAGS+=          $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags glib-2.0) $(pkg-config --cflags gdk) $(pkg-config --cflags libffmpegthumbnailer)
-LDFLAG+=         $(pkg-config --libs gtk+-3.0) $(pkg-config --libs glib-2.0) $(pkg-config --libs gdk) $(pkg-config --libs libffmpegthumbnailer)
+CFLAGS+=         -ludev
 export FFMPEG_CFLAGS=   $(pkg-config --cflags libffmpegthumbnailer)
 export FFMPEG_LIBS=     $(pkg-config --libs libffmpegthumbnailer)
-AM_CFLAGS+=      $(pkg-config --cflags gtk+-3.0)
-CPPFLAGS+=       $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags glib-2.0) $(pkg-config --cflags gdk) $(pkg-config --cflags libffmpegthumbnailer)
 
 .include "../../x11/gtk3/buildlink3.mk"
 PLIST.gtk3=             yes
Home | Main Index | Thread Index | Old Index