pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lumina: Set version 0.9.0 - drop patch



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu May 26 11:15:23 2016 +0200
Changeset:	183eeecd4b3a703e808e0b3e94a9ed312362bc70

Modified Files:
	lumina/Makefile
	lumina/PLIST
	lumina/distinfo
Removed Files:
	lumina/patches/patch-OS-detect.pri

Log Message:
lumina: Set version 0.9.0 - drop patch

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

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

diffstat:
 lumina/Makefile                    | 23 ++++++++++-------------
 lumina/PLIST                       |  9 +++++++--
 lumina/distinfo                    |  1 -
 lumina/patches/patch-OS-detect.pri | 17 -----------------
 4 files changed, 17 insertions(+), 33 deletions(-)

diffs:
diff --git a/lumina/Makefile b/lumina/Makefile
index ff9642d..79e86fd 100644
--- a/lumina/Makefile
+++ b/lumina/Makefile
@@ -1,10 +1,9 @@
 # $NetBSD$
 
 DISTNAME=	lumina-0.9.0
-PATCHREL=	-P1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=pcbsd/}
-GITHUB_TAG=	v${PKGVERSION_NOREV}-Release${PATCHREL}
+GITHUB_TAG=	v${PKGVERSION_NOREV}-Release
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://lumina-desktop.org/
@@ -27,22 +26,20 @@ DEPENDS+=	numlockx-[0-9]*:../../x11/numlockx
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	post-patch
 SUBST_MESSAGE.prefix=	Fixing prefix
-SUBST_FILES.prefix=	libLumina/LuminaXDG.cpp
-SUBST_FILES.prefix+=	lumina-config/mainUI.cpp
-SUBST_FILES.prefix+=	lumina-desktop/SettingsMenu.cpp
-SUBST_FILES.prefix+=	libLumina/LuminaOS-NetBSD.cpp
+SUBST_FILES.prefix=	src-qt5/core/libLumina/LuminaXDG.cpp
+SUBST_FILES.prefix+=	src-qt5/core/libLumina/LuminaOS-NetBSD.cpp
 SUBST_SED.prefix=	-e 's,/usr/local,${PREFIX},'
 
-SUBST_CLASSES+=		sysconf
-SUBST_STAGE.sysconf=	post-patch
-SUBST_MESSAGE.sysconf=	Fixing system configuration dir
-SUBST_FILES.sysconf=	libLumina/LuminaUtils.cpp
-SUBST_SED.sysconf=	-e 's,/etc/luminaDesktop.conf,${PKG_SYSCONFDIR}/luminaDesktop.conf,'
+#SUBST_CLASSES+=		sysconf
+#SUBST_STAGE.sysconf=	post-patch
+#SUBST_MESSAGE.sysconf=	Fixing system configuration dir
+#SUBST_FILES.sysconf=	src-qt5/core/libLumina/LuminaUtils.cpp
+#SUBST_SED.sysconf=	-e 's,/etc/luminaDesktop.conf,${PKG_SYSCONFDIR}/luminaDesktop.conf,'
 
 SUBST_CLASSES+=		egdir
 SUBST_STAGE.egdir=	post-patch
 SUBST_MESSAGE.egdir=	Install configuration to example dir
-SUBST_FILES.egdir=	lumina-desktop/lumina-desktop.pro
+SUBST_FILES.egdir=	src-qt5/core/lumina-desktop/lumina-desktop.pro
 SUBST_SED.egdir=	-e 's,\$\$PREFIX/etc/luminaDesktop.conf.dist,${EGDIR}/luminaDesktop.conf,'
 
 INSTALL_MAKE_FLAGS=		INSTALL_ROOT=${DESTDIR}
@@ -54,7 +51,7 @@ pre-build:
 
 pre-install:
 	${RUN} ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
-	${RUN} ${INSTALL_DATA} ${WRKSRC}/lumina-desktop/defaults/luminaDesktop.conf ${DESTDIR}${EGDIR}
+	${RUN} ${INSTALL_DATA} ${WRKSRC}/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf ${DESTDIR}${EGDIR}
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
diff --git a/lumina/PLIST b/lumina/PLIST
index e080999..a7c765a 100644
--- a/lumina/PLIST
+++ b/lumina/PLIST
@@ -7,7 +7,9 @@ bin/lumina-info
 bin/lumina-open
 bin/lumina-screenshot
 bin/lumina-search
+bin/lumina-textedit
 bin/lumina-xconfig
+bin/start-lumina-desktop
 etc/luminaDesktop.conf.dist
 include/LuminaOS.h
 include/LuminaSingleApplication.h
@@ -33,7 +35,6 @@ share/Lumina-DE/desktop-background.jpg
 share/Lumina-DE/fluxbox-init-rc
 share/Lumina-DE/fluxbox-keys
 share/Lumina-DE/luminaDesktop.conf
-share/Lumina-DE/quickplugins/quick-sample.qml
 share/Lumina-DE/themes/Lumina-default.qss.template
 share/Lumina-DE/themes/None.qss.template
 share/applications/lumina-fm.desktop
@@ -41,11 +42,15 @@ share/applications/lumina-info.desktop
 share/applications/lumina-screenshot.desktop
 share/applications/lumina-search.desktop
 share/applications/lumina-support.desktop
+share/applications/lumina-textedit.desktop
 share/examples/lumina/luminaDesktop.conf
-share/pixmaps/Insight-FileManager.png
 share/pixmaps/Lumina-DE.png
+share/wallpapers/Lumina-DE/Lumina_Wispy_blue-grey-zoom.jpg
+share/wallpapers/Lumina-DE/Lumina_Wispy_blue-grey.jpg
 share/wallpapers/Lumina-DE/Lumina_Wispy_gold.jpg
 share/wallpapers/Lumina-DE/Lumina_Wispy_green.jpg
+share/wallpapers/Lumina-DE/Lumina_Wispy_grey-blue-zoom.jpg
+share/wallpapers/Lumina-DE/Lumina_Wispy_grey-blue.jpg
 share/wallpapers/Lumina-DE/Lumina_Wispy_purple.jpg
 share/wallpapers/Lumina-DE/Lumina_Wispy_red.jpg
 share/xsessions/Lumina-DE.desktop
diff --git a/lumina/distinfo b/lumina/distinfo
index 29136f1..4b9c265 100644
--- a/lumina/distinfo
+++ b/lumina/distinfo
@@ -4,4 +4,3 @@ SHA1 (lumina-0.9.0.tar.gz) = 8d391ec7c8e4f272ad69be99fdf99b0797ec3a15
 RMD160 (lumina-0.9.0.tar.gz) = 35cdf2f3d9afe8e20da6f49733ecbf70803a4e91
 SHA512 (lumina-0.9.0.tar.gz) = 577b8d54a1379da4835844764e3fde4260e861f8534a4ba3d7176bde48970f3047bfcf1bbb5cc7031a66db8c354a3870ec1e31c8728f6124dce8ef4d1f7c8c05
 Size (lumina-0.9.0.tar.gz) = 53811174 bytes
-SHA1 (patch-OS-detect.pri) = c1ee01fbd9602fccf8225159ec2d5b8f3f876c5c
diff --git a/lumina/patches/patch-OS-detect.pri b/lumina/patches/patch-OS-detect.pri
deleted file mode 100644
index 435937a..0000000
--- a/lumina/patches/patch-OS-detect.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
---- OS-detect.pri.orig	2016-02-10 20:41:00.000000000 +0000
-+++ OS-detect.pri
-@@ -46,9 +46,9 @@
-     
-   }else : netbsd-*{
-     OS = NetBSD
--    LIBS += -L/usr/local/lib -L/usr/lib
--    PREFIX=/usr/local
--    LIBPREFIX=/usr/local/lib
-+    LIBS += -L/usr/pkg/lib -L/usr/lib -L/usr/X11R7/lib/ -Wl,-R/usr/X11R7/lib/ -Wl,-R/usr/pkg/lib
-+    PREFIX=/usr/pkg
-+    LIBPREFIX=/usr/pkg/lib
-     #Use the defaults for everything else
-     
-   }else : linux-*{


Home | Main Index | Thread Index | Old Index