pkgsrc-WIP-changes archive

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

kwindowsystem: update wip/kwindowsystem to 5.18.0



Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Sun Jan 31 17:46:43 2016 +1300
Changeset:	0f6fe5dc4a6f3fc77bcddd28f0a26fb9bcb96692

Modified Files:
	kwindowsystem/DESCR
	kwindowsystem/Makefile
	kwindowsystem/PLIST
	kwindowsystem/buildlink3.mk
	kwindowsystem/distinfo

Log Message:
kwindowsystem: update wip/kwindowsystem to 5.18.0

Bring in line with other KDE Frameworks.

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

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

diffstat:
 kwindowsystem/DESCR         | 18 ++++++++++--------
 kwindowsystem/Makefile      | 18 ++++++++----------
 kwindowsystem/PLIST         | 12 +++++++++---
 kwindowsystem/buildlink3.mk |  6 +++---
 kwindowsystem/distinfo      |  9 +++++----
 5 files changed, 35 insertions(+), 28 deletions(-)

diffs:
diff --git a/kwindowsystem/DESCR b/kwindowsystem/DESCR
index aff73b8..3c785c4 100644
--- a/kwindowsystem/DESCR
+++ b/kwindowsystem/DESCR
@@ -1,10 +1,12 @@
-Convenience access to certain properties and features of the windowing system.
+Convenience access to certain properties and features of the windowing
+system.
 
-KWindowSystem provides information about the windowing system and allows
-interaction with the windowing system. It provides an high level API which is
-windowing system independent and has platform specific implementations. This
-API is inspired by X11 and thus not all functionality is available on all
-windowing systems.
+KWindowSystem provides information about the windowing system and
+allows interaction with the windowing system. It provides an high
+level API which is windowing system independent and has platform
+specific implementations. This API is inspired by X11 and thus not all
+functionality is available on all windowing systems.
 
-In addition to the high level API, this framework also provides several more
-low level classes for interaction with the X Windowing System.
+In addition to the high level API, this framework also provides
+several more low level classes for interaction with the X Windowing
+System.
diff --git a/kwindowsystem/Makefile b/kwindowsystem/Makefile
index 50c193c..db932e8 100644
--- a/kwindowsystem/Makefile
+++ b/kwindowsystem/Makefile
@@ -1,18 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2015/04/11 13:00:41 krytarowski Exp $
+# $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
-DISTNAME=	kwindowsystem-5.9.0
-PKGREVISION=	1
+DISTNAME=	kwindowsystem-${KF5VER}
 CATEGORIES=	x11
-MASTER_SITES=	http://download.kde.org/stable/frameworks/5.9/
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://projects.kde.org/projects/frameworks/kwindowsystem
 COMMENT=	Access to the windowing system
 LICENSE=	gnu-lgpl-v2.1
 
-USE_CMAKE=	yes
-USE_LANGUAGES=	c c++
+.include "../../wip/kf5/Makefile.common"
+
 USE_TOOLS+=	pkg-config
 
 # don't leak buildlink reference in INTERFACE_INCLUDE_DIRECTORIES
@@ -20,9 +16,11 @@ USE_TOOLS+=	pkg-config
 SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		post-configure
 SUBST_MESSAGE.fix-paths=	Cleaning up INTERFACE_INCLUDE_DIRECTORIES
-SUBST_FILES.fix-paths=		CMakeFiles/Export/lib/cmake/KF5WindowSystem/KF5WindowSystemTargets.cmake
+SUBST_FILES.fix-paths=		_KDE_build/CMakeFiles/Export/lib/cmake/KF5WindowSystem/KF5WindowSystemTargets.cmake
 SUBST_SED.fix-paths=		-e 's,${BUILDLINK_DIR},${X11BASE},g'
 
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"
-.include "../../wip/extra-cmake-modules/buildlink3.mk"
+BUILDLINK_DEPMETHOD.qt5-qttools= build
+.include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/kwindowsystem/PLIST b/kwindowsystem/PLIST
index de9feba..b017746 100644
--- a/kwindowsystem/PLIST
+++ b/kwindowsystem/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/04/11 13:00:41 krytarowski Exp $
+@comment $NetBSD$
 include/KF5/KWindowSystem/KKeyServer
 include/KF5/KWindowSystem/KSelectionOwner
 include/KF5/KWindowSystem/KSelectionWatcher
@@ -25,15 +25,21 @@ include/KF5/KWindowSystem/kwindowsystem_export.h
 include/KF5/KWindowSystem/kxmessages.h
 include/KF5/KWindowSystem/netwm.h
 include/KF5/KWindowSystem/netwm_def.h
+include/KF5/KWindowSystem/private/kwindoweffects_p.h
+include/KF5/KWindowSystem/private/kwindowinfo_p.h
+include/KF5/KWindowSystem/private/kwindowsystem_p.h
+include/KF5/KWindowSystem/private/kwindowsystemplugininterface_p.h
 include/KF5/kwindowsystem_version.h
 lib/cmake/KF5WindowSystem/KF5WindowSystemConfig.cmake
 lib/cmake/KF5WindowSystem/KF5WindowSystemConfigVersion.cmake
 lib/cmake/KF5WindowSystem/KF5WindowSystemTargets-noconfig.cmake
 lib/cmake/KF5WindowSystem/KF5WindowSystemTargets.cmake
-lib/libKF5WindowSystem.${RUBY_DLEXT}
+lib/libKF5WindowSystem.so
 lib/libKF5WindowSystem.so.5
 lib/libKF5WindowSystem.so.${PKGVERSION}
-mkspecs/modules/qt_KWindowSystem.pri
+qt5/mkspecs/modules/qt_KWindowSystem.pri
+qt5/plugins/kf5/org.kde.kwindowsystem.platforms/KF5WindowSystemWaylandPlugin.so
+qt5/plugins/kf5/org.kde.kwindowsystem.platforms/KF5WindowSystemX11Plugin.so
 share/locale/af/LC_MESSAGES/kwindowsystem5_qt.qm
 share/locale/ar/LC_MESSAGES/kwindowsystem5_qt.qm
 share/locale/as/LC_MESSAGES/kwindowsystem5_qt.qm
diff --git a/kwindowsystem/buildlink3.mk b/kwindowsystem/buildlink3.mk
index 28b8bc5..180bc70 100644
--- a/kwindowsystem/buildlink3.mk
+++ b/kwindowsystem/buildlink3.mk
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/04/11 13:00:41 krytarowski Exp $
+# $NetBSD$
 
 BUILDLINK_TREE+=	kwindowsystem
 
 .if !defined(KWINDOWSYSTEM_BUILDLINK3_MK)
 KWINDOWSYSTEM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.kwindowsystem+=	kwindowsystem>=5.9.0
+BUILDLINK_API_DEPENDS.kwindowsystem+=	kwindowsystem>=5.18.0
 BUILDLINK_PKGSRCDIR.kwindowsystem?=	../../wip/kwindowsystem
 
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"
-.include "../../wip/extra-cmake-modules/buildlink3.mk"
 .endif	# KWINDOWSYSTEM_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-kwindowsystem
diff --git a/kwindowsystem/distinfo b/kwindowsystem/distinfo
index 4d4e2d1..bce16fc 100644
--- a/kwindowsystem/distinfo
+++ b/kwindowsystem/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2015/04/11 13:00:41 krytarowski Exp $
+$NetBSD$
 
-SHA1 (kwindowsystem-5.9.0.tar.xz) = 1dfe65a9f4c0c3e99342a8b085d0b60bf4fef296
-RMD160 (kwindowsystem-5.9.0.tar.xz) = 1efc43799101b6e3a8f504a9b40efa238c92b6b9
-Size (kwindowsystem-5.9.0.tar.xz) = 160672 bytes
+SHA1 (kwindowsystem-5.18.0.tar.xz) = 6aa1d1e590dc500a7511a95a8d0d6bac93eb19d2
+RMD160 (kwindowsystem-5.18.0.tar.xz) = 6f6836e1000c0d21e0e637bd187a1eed7f92feda
+SHA512 (kwindowsystem-5.18.0.tar.xz) = 4c67d23e62de3d34fb9f2055bfa6b8608d52c2faf1129e32426798e6c84d8f9d94452305ed9829b56663c24442c5d0cffc8ecb27fbf55f7a7d45cfa7a9b10691
+Size (kwindowsystem-5.18.0.tar.xz) = 163260 bytes


Home | Main Index | Thread Index | Old Index