Github messages for voidlinux
 help / color / mirror / Atom feed
From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Remove KDE5 libkscreen
Date: Tue, 14 May 2024 01:34:10 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-50324@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages remove-kde5-libkscreen
https://github.com/void-linux/void-packages/pull/50324

Remove KDE5 libkscreen
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/50324.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-kde5-libkscreen-50324.patch --]
[-- Type: text/x-diff, Size: 4257 bytes --]

From 465d1a222fc3bef9461e9448b119f0235d4be56f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 14 May 2024 06:30:39 +0700
Subject: [PATCH 1/2] lxqt-config: disable monitor config

It configures for KDE5 kscreen, which is no longer used.
---
 srcpkgs/lxqt-config/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lxqt-config/template b/srcpkgs/lxqt-config/template
index f3e0f559ae1928..e0eda46a30b2d3 100644
--- a/srcpkgs/lxqt-config/template
+++ b/srcpkgs/lxqt-config/template
@@ -1,11 +1,12 @@
 # Template file for 'lxqt-config'
 pkgname=lxqt-config
 version=1.4.0
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD=17"
+# WITH_MONITOR uses libkscreen, re-enable when it moved to KDE6
+configure_args="-DCMAKE_CXX_STANDARD=17 -DWITH_MONITOR=OFF"
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
-makedepends="liblxqt-devel libXcursor-devel libkscreen-devel
+makedepends="liblxqt-devel libXcursor-devel
  xf86-input-libinput-devel libqtxdg-devel lxqt-menu-data-devel"
 depends="lxqt-menu-data"
 short_desc="LXQt System Settings"

From 8078cb595a4ab6cc43cef4c4f06f92ae2a12fe4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 14 May 2024 06:32:20 +0700
Subject: [PATCH 2/2] libkscreen: remove package

---
 common/shlibs                     |  2 --
 srcpkgs/libkscreen-devel          |  1 -
 srcpkgs/libkscreen/template       | 35 -------------------------------
 srcpkgs/removed-packages/template |  1 +
 4 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 120000 srcpkgs/libkscreen-devel
 delete mode 100644 srcpkgs/libkscreen/template

diff --git a/common/shlibs b/common/shlibs
index 8f0811c72c81ac..e2b32e29a2ea4a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2594,8 +2594,6 @@ libosgUtil.so.161 osg-3.6.5_1
 libosgVolume.so.161 osg-3.6.5_1
 libosgGA.so.161 osg-3.6.5_1
 libosgPresentation.so.161 osg-3.6.5_1
-libKF5Screen.so.8 libkscreen-5.26.90_1
-libKF5ScreenDpms.so.8 libkscreen-5.26.90_1
 libKF6Screen.so.8 libkf6screen-6.0.0_1
 libKF6ScreenDpms.so.8 libkf6screen-6.0.0_1
 libdbusmenu-qt5.so.2 libdbusmenu-qt5-0.9.3.0_1
diff --git a/srcpkgs/libkscreen-devel b/srcpkgs/libkscreen-devel
deleted file mode 120000
index 29f843cfac44e6..00000000000000
--- a/srcpkgs/libkscreen-devel
+++ /dev/null
@@ -1 +0,0 @@
-libkscreen
\ No newline at end of file
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
deleted file mode 100644
index d1c5947a232c72..00000000000000
--- a/srcpkgs/libkscreen/template
+++ /dev/null
@@ -1,35 +0,0 @@
-# Template file for 'libkscreen'
-pkgname=libkscreen
-version=5.27.11
-revision=3
-build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel
- plasma-wayland-protocols qt5-wayland wayland-devel"
-makedepends="qt5-tools-devel qt5-x11extras-devel libXrandr-devel kwayland-devel
- kconfig-devel"
-short_desc="KDE screen management software"
-maintainer="John <me@johnnynator.dev>"
-license="LGPL-2.1-or-later"
-homepage="https://invent.kde.org/plasma/libkscreen"
-distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0d11f41d489f32303988e5a2eee8cef7f4eb18faea5614e65bf202007ea21dd5
-
-post_install() {
-	rm -rf "${DESTDIR}/usr/bin"
-	rm -rf "${DESTDIR}/usr/lib/systemd"
-	rm -rf "${DESTDIR}/usr/share/dbus-1"
-	rm -rf "${DESTDIR}/usr/share/zsh"
-}
-
-libkscreen-devel_package() {
-	short_desc+=" - development"
-	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/qt5/mkspecs
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 76482075d691eb..7c7e142d97c829 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -355,6 +355,7 @@ replaces="
  libgnome-keyring<=3.12.0_5
  libgroff<=1.22.4_3
  libgtkhtml<=4.10.0_1
+ libkscreen<=5.27.11_3
  libllvm10<=10.0.0_8
  libllvm11<=11.0.0_2
  libllvm6.0<=6.0.1_8

             reply	other threads:[~2024-05-13 23:34 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-13 23:34 sgn [this message]
2024-05-22  2:45 ` sgn
2024-06-23  7:53 ` [PR PATCH] [Closed]: " sgn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-50324@inbox.vuxu.org \
    --to=sgn@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).