pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
kwayland: now in devel
Module Name: pkgsrc-wip
Committed By: Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By: markd
Date: Wed Aug 28 09:50:10 2019 +1200
Changeset: a9290e5d5a6e81318d4a1e6c10e6b18547ffd8ed
Modified Files:
breeze/Makefile
kinfocenter/Makefile
kscreenlocker/Makefile
kscreenlocker/buildlink3.mk
libkscreen/Makefile
libkscreen/buildlink3.mk
oxygen/Makefile
plasma-integration/Makefile
Removed Files:
kwayland/DESCR
kwayland/Makefile
kwayland/PLIST
kwayland/buildlink3.mk
kwayland/distinfo
Log Message:
kwayland: now in devel
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a9290e5d5a6e81318d4a1e6c10e6b18547ffd8ed
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
breeze/Makefile | 2 +-
kinfocenter/Makefile | 2 +-
kscreenlocker/Makefile | 2 +-
kscreenlocker/buildlink3.mk | 2 +-
kwayland/DESCR | 10 ----
kwayland/Makefile | 29 -----------
kwayland/PLIST | 114 --------------------------------------------
kwayland/buildlink3.mk | 15 ------
kwayland/distinfo | 6 ---
libkscreen/Makefile | 2 +-
libkscreen/buildlink3.mk | 2 +-
oxygen/Makefile | 2 +-
plasma-integration/Makefile | 2 +-
13 files changed, 8 insertions(+), 182 deletions(-)
diffs:
diff --git a/breeze/Makefile b/breeze/Makefile
index 7ab677eaac..499103ba1d 100644
--- a/breeze/Makefile
+++ b/breeze/Makefile
@@ -16,7 +16,7 @@ USE_TOOLS+= msgmerge pkg-config
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../x11/frameworkintegration/buildlink3.mk"
.include "../../wip/kdecoration/buildlink3.mk"
-.include "../../wip/kwayland/buildlink3.mk"
+.include "../../devel/kwayland/buildlink3.mk"
.include "../../devel/kcmutils/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/kinfocenter/Makefile b/kinfocenter/Makefile
index daefb3875a..cbd99a6a88 100644
--- a/kinfocenter/Makefile
+++ b/kinfocenter/Makefile
@@ -27,7 +27,7 @@ CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/menus/kinfocenter.menu \
.include "../../devel/kcmutils/buildlink3.mk"
.include "../../devel/kio/buildlink3.mk"
.include "../../x11/kdelibs4support/buildlink3.mk"
-.include "../../wip/kwayland/buildlink3.mk"
+.include "../../devel/kwayland/buildlink3.mk"
.include "../../x11/plasma-framework/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/kscreenlocker/Makefile b/kscreenlocker/Makefile
index fe3ef4588c..c2f28ee33d 100644
--- a/kscreenlocker/Makefile
+++ b/kscreenlocker/Makefile
@@ -21,6 +21,6 @@ SPECIAL_PERMS+= ${PREFIX}/libexec/kcheckpass \
.include "../../mk/pam.buildlink3.mk"
.include "../../devel/kdeclarative/buildlink3.mk"
.include "../../devel/kidletime/buildlink3.mk"
-.include "../../wip/kwayland/buildlink3.mk"
+.include "../../devel/kwayland/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/kscreenlocker/buildlink3.mk b/kscreenlocker/buildlink3.mk
index 2e1924716d..7a646daf18 100644
--- a/kscreenlocker/buildlink3.mk
+++ b/kscreenlocker/buildlink3.mk
@@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.kscreenlocker?= ../../wip/kscreenlocker
.include "../../devel/kdeclarative/buildlink3.mk"
.include "../../devel/kidletime/buildlink3.mk"
-.include "../../wip/kwayland/buildlink3.mk"
+.include "../../devel/kwayland/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.endif # KSCREENLOCKER_BUILDLINK3_MK
diff --git a/kwayland/DESCR b/kwayland/DESCR
deleted file mode 100644
index 4a982d7b26..0000000000
--- a/kwayland/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-KWayland provides two libraries:
-
-- KWayland::Client
-- KWayland::Server
-
-As the names suggest they implement a Client respectively a Server API for the Wayland
-protocol. The API is Qt-styled removing the needs to interact with a for a Qt developer
-uncomfortable low-level C-API. For example the callback mechanism from the Wayland API
-is replaced by signals; data types are adjusted to be what a Qt developer expects, e.g.
-two arguments of int are represented by a QPoint or a QSize.
diff --git a/kwayland/Makefile b/kwayland/Makefile
deleted file mode 100644
index add011761a..0000000000
--- a/kwayland/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
-
-DISTNAME= kwayland-${KF5VER}
-CATEGORIES= x11
-
-HOMEPAGE= https://community.kde.org/Frameworks
-COMMENT= Qt-style Client and Server library wrapper for the Wayland libraries
-LICENSE= gnu-lgpl-v2.1
-
-.include "../../meta-pkgs/kde/kf5.mk"
-
-USE_TOOLS+= pkg-config
-# Don't do autotests. Some builds are linux specific.
-CMAKE_ARGS+= -DBUILD_TESTING=no
-
-SUBST_CLASSES+= xdg
-SUBST_STAGE.xdg= pre-configure
-SUBST_MESSAGE.xdg= Install via examples dir.
-SUBST_FILES.xdg= src/CMakeLists.txt
-SUBST_SED.xdg= -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_XDG_EX_DIR}:'
-
-MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg
-CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/org_kde_kwayland.categories \
- ${PKG_SYSCONFDIR}/xdg/org_kde_kwayland.categories
-
-.include "../../wip/wayland/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
-
diff --git a/kwayland/PLIST b/kwayland/PLIST
deleted file mode 100644
index ef0c2d887e..0000000000
--- a/kwayland/PLIST
+++ /dev/null
@@ -1,114 +0,0 @@
-@comment $NetBSD$
-include/KF5/KWayland/Client/appmenu.h
-include/KF5/KWayland/Client/blur.h
-include/KF5/KWayland/Client/buffer.h
-include/KF5/KWayland/Client/compositor.h
-include/KF5/KWayland/Client/connection_thread.h
-include/KF5/KWayland/Client/contrast.h
-include/KF5/KWayland/Client/datadevice.h
-include/KF5/KWayland/Client/datadevicemanager.h
-include/KF5/KWayland/Client/dataoffer.h
-include/KF5/KWayland/Client/datasource.h
-include/KF5/KWayland/Client/dpms.h
-include/KF5/KWayland/Client/event_queue.h
-include/KF5/KWayland/Client/fakeinput.h
-include/KF5/KWayland/Client/fullscreen_shell.h
-include/KF5/KWayland/Client/idle.h
-include/KF5/KWayland/Client/idleinhibit.h
-include/KF5/KWayland/Client/keyboard.h
-include/KF5/KWayland/Client/kwaylandclient_export.h
-include/KF5/KWayland/Client/output.h
-include/KF5/KWayland/Client/outputconfiguration.h
-include/KF5/KWayland/Client/outputdevice.h
-include/KF5/KWayland/Client/outputmanagement.h
-include/KF5/KWayland/Client/plasmashell.h
-include/KF5/KWayland/Client/plasmavirtualdesktop.h
-include/KF5/KWayland/Client/plasmawindowmanagement.h
-include/KF5/KWayland/Client/plasmawindowmodel.h
-include/KF5/KWayland/Client/pointer.h
-include/KF5/KWayland/Client/pointerconstraints.h
-include/KF5/KWayland/Client/pointergestures.h
-include/KF5/KWayland/Client/region.h
-include/KF5/KWayland/Client/registry.h
-include/KF5/KWayland/Client/relativepointer.h
-include/KF5/KWayland/Client/remote_access.h
-include/KF5/KWayland/Client/seat.h
-include/KF5/KWayland/Client/server_decoration.h
-include/KF5/KWayland/Client/server_decoration_palette.h
-include/KF5/KWayland/Client/shadow.h
-include/KF5/KWayland/Client/shell.h
-include/KF5/KWayland/Client/shm_pool.h
-include/KF5/KWayland/Client/slide.h
-include/KF5/KWayland/Client/subcompositor.h
-include/KF5/KWayland/Client/subsurface.h
-include/KF5/KWayland/Client/surface.h
-include/KF5/KWayland/Client/textinput.h
-include/KF5/KWayland/Client/touch.h
-include/KF5/KWayland/Client/xdgdecoration.h
-include/KF5/KWayland/Client/xdgforeign.h
-include/KF5/KWayland/Client/xdgoutput.h
-include/KF5/KWayland/Client/xdgshell.h
-include/KF5/KWayland/Server/appmenu_interface.h
-include/KF5/KWayland/Server/blur_interface.h
-include/KF5/KWayland/Server/buffer_interface.h
-include/KF5/KWayland/Server/clientconnection.h
-include/KF5/KWayland/Server/compositor_interface.h
-include/KF5/KWayland/Server/contrast_interface.h
-include/KF5/KWayland/Server/datadevice_interface.h
-include/KF5/KWayland/Server/datadevicemanager_interface.h
-include/KF5/KWayland/Server/dataoffer_interface.h
-include/KF5/KWayland/Server/datasource_interface.h
-include/KF5/KWayland/Server/display.h
-include/KF5/KWayland/Server/dpms_interface.h
-include/KF5/KWayland/Server/fakeinput_interface.h
-include/KF5/KWayland/Server/filtered_display.h
-include/KF5/KWayland/Server/global.h
-include/KF5/KWayland/Server/idle_interface.h
-include/KF5/KWayland/Server/idleinhibit_interface.h
-include/KF5/KWayland/Server/keyboard_interface.h
-include/KF5/KWayland/Server/kwaylandserver_export.h
-include/KF5/KWayland/Server/output_interface.h
-include/KF5/KWayland/Server/outputchangeset.h
-include/KF5/KWayland/Server/outputconfiguration_interface.h
-include/KF5/KWayland/Server/outputdevice_interface.h
-include/KF5/KWayland/Server/outputmanagement_interface.h
-include/KF5/KWayland/Server/plasmashell_interface.h
-include/KF5/KWayland/Server/plasmavirtualdesktop_interface.h
-include/KF5/KWayland/Server/plasmawindowmanagement_interface.h
-include/KF5/KWayland/Server/pointer_interface.h
-include/KF5/KWayland/Server/pointerconstraints_interface.h
-include/KF5/KWayland/Server/pointergestures_interface.h
-include/KF5/KWayland/Server/qtsurfaceextension_interface.h
-include/KF5/KWayland/Server/region_interface.h
-include/KF5/KWayland/Server/relativepointer_interface.h
-include/KF5/KWayland/Server/remote_access_interface.h
-include/KF5/KWayland/Server/resource.h
-include/KF5/KWayland/Server/seat_interface.h
-include/KF5/KWayland/Server/server_decoration_interface.h
-include/KF5/KWayland/Server/server_decoration_palette_interface.h
-include/KF5/KWayland/Server/shadow_interface.h
-include/KF5/KWayland/Server/shell_interface.h
-include/KF5/KWayland/Server/slide_interface.h
-include/KF5/KWayland/Server/subcompositor_interface.h
-include/KF5/KWayland/Server/surface_interface.h
-include/KF5/KWayland/Server/textinput_interface.h
-include/KF5/KWayland/Server/touch_interface.h
-include/KF5/KWayland/Server/xdgdecoration_interface.h
-include/KF5/KWayland/Server/xdgforeign_interface.h
-include/KF5/KWayland/Server/xdgoutput_interface.h
-include/KF5/KWayland/Server/xdgshell_interface.h
-include/KF5/kwayland_version.h
-lib/cmake/KF5Wayland/KF5WaylandConfig.cmake
-lib/cmake/KF5Wayland/KF5WaylandConfigVersion.cmake
-lib/cmake/KF5Wayland/KF5WaylandTargets-noconfig.cmake
-lib/cmake/KF5Wayland/KF5WaylandTargets.cmake
-lib/libKF5WaylandClient.so
-lib/libKF5WaylandClient.so.5
-lib/libKF5WaylandClient.so.${PKGVERSION}
-lib/libKF5WaylandServer.so
-lib/libKF5WaylandServer.so.5
-lib/libKF5WaylandServer.so.${PKGVERSION}
-libexec/org-kde-kf5-kwayland-testserver
-qt5/mkspecs/modules/qt_KWaylandClient.pri
-qt5/mkspecs/modules/qt_KWaylandServer.pri
-share/examples/kde-xdg/org_kde_kwayland.categories
diff --git a/kwayland/buildlink3.mk b/kwayland/buildlink3.mk
deleted file mode 100644
index d9659154a7..0000000000
--- a/kwayland/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+= kwayland
-
-.if !defined(KWAYLAND_BUILDLINK3_MK)
-KWAYLAND_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.kwayland+= kwayland>=5.6.3
-BUILDLINK_PKGSRCDIR.kwayland?= ../../wip/kwayland
-
-.include "../../wip/wayland/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.endif # KWAYLAND_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -kwayland
diff --git a/kwayland/distinfo b/kwayland/distinfo
deleted file mode 100644
index c48a90b48c..0000000000
--- a/kwayland/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (kwayland-5.57.0.tar.xz) = be59cc806827cab195ef5d08cf1f1dcb5013a5f2
-RMD160 (kwayland-5.57.0.tar.xz) = 6a4b7697d058e173576540871641c440252c1ce8
-SHA512 (kwayland-5.57.0.tar.xz) = 95caf19c0add3f853de7c330b070adb8c9012b4abd84bd235852cc9c3b8795981e5d113f893e4022bb3d3844391f27c8237fb66981bd80a465ec0388331e4fec
-Size (kwayland-5.57.0.tar.xz) = 340180 bytes
diff --git a/libkscreen/Makefile b/libkscreen/Makefile
index a04069c5bd..ab4d6a5edf 100644
--- a/libkscreen/Makefile
+++ b/libkscreen/Makefile
@@ -13,7 +13,7 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= src/kscreen2.pc.in
-.include "../../wip/kwayland/buildlink3.mk"
+.include "../../devel/kwayland/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qtx11extras/buildlink3.mk"
#.include "../../x11/libXrandr/buildlink3.mk"
diff --git a/libkscreen/buildlink3.mk b/libkscreen/buildlink3.mk
index 75df2aee3f..d5d22baead 100644
--- a/libkscreen/buildlink3.mk
+++ b/libkscreen/buildlink3.mk
@@ -8,7 +8,7 @@ LIBKSCREEN_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libkscreen+= libkscreen>=5.6.3
BUILDLINK_PKGSRCDIR.libkscreen?= ../../wip/libkscreen
-.include "../../wip/kwayland/buildlink3.mk"
+.include "../../devel/kwayland/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qtx11extras/buildlink3.mk"
.endif # LIBKSCREEN_BUILDLINK3_MK
diff --git a/oxygen/Makefile b/oxygen/Makefile
index c32bd00402..ad958f65a8 100644
--- a/oxygen/Makefile
+++ b/oxygen/Makefile
@@ -15,7 +15,7 @@ USE_TOOLS+= msgmerge pkg-config
.include "../../wip/kdecoration/buildlink3.mk"
.include "../../devel/kcmutils/buildlink3.mk"
-.include "../../wip/kwayland/buildlink3.mk"
+.include "../../devel/kwayland/buildlink3.mk"
.include "../../x11/frameworkintegration/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/plasma-integration/Makefile b/plasma-integration/Makefile
index c4348fc356..e986e03d29 100644
--- a/plasma-integration/Makefile
+++ b/plasma-integration/Makefile
@@ -19,7 +19,7 @@ USE_TOOLS+= msgmerge
REPLACE_PERL+= src/platformtheme/*.pl
.include "../../devel/kio/buildlink3.mk"
-.include "../../wip/kwayland/buildlink3.mk"
+.include "../../devel/kwayland/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qtquickcontrols2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index