pkgsrc-WIP-changes archive

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

lxqt-admin-0.14.1, modify patch



Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Wed Feb 12 11:10:09 2020 +0100
Changeset:	9d5e2ac060fe9805ea3a61138e7ce8a1edd36992

Modified Files:
	lxqt-admin/distinfo
	lxqt-admin/patches/patch-CMakeLists.txt

Log Message:
lxqt-admin-0.14.1, modify patch

Upstream LXQt asked to modify the patch in order to
consider merge.

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

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

diffstat:
 lxqt-admin/distinfo                     |  2 +-
 lxqt-admin/patches/patch-CMakeLists.txt | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diffs:
diff --git a/lxqt-admin/distinfo b/lxqt-admin/distinfo
index 90743f02b2..8f661e9244 100644
--- a/lxqt-admin/distinfo
+++ b/lxqt-admin/distinfo
@@ -4,5 +4,5 @@ SHA1 (lxqt-admin-0.14.1.tar.xz) = 4c4c76f1b1441063b6a77664fb45ba69792dd81c
 RMD160 (lxqt-admin-0.14.1.tar.xz) = 2519de22bdb1c90caa956d12e6ea6ae711c6f19a
 SHA512 (lxqt-admin-0.14.1.tar.xz) = bd6272a3042a71e9e00b2ba10be2575649c2d2750a4e00a6e11adaae6b91ccab5e3cf79a8ceb7bfbe808ec80c139b93e02cd96990f80b68a77a974c063e6a373
 Size (lxqt-admin-0.14.1.tar.xz) = 141088 bytes
-SHA1 (patch-CMakeLists.txt) = db95d18fc2a379ba7bab5473f2859bb7a53906b9
+SHA1 (patch-CMakeLists.txt) = edb73bcfbf4655a9e9d223c21db4693c902ce6a4
 SHA1 (patch-lxqt-admin-time_lxqt-admin-time-helper.freebsd) = cc7df316cd0bc06927245ec8cda10b89c1aac9c5
diff --git a/lxqt-admin/patches/patch-CMakeLists.txt b/lxqt-admin/patches/patch-CMakeLists.txt
index f82840000d..98dee59101 100644
--- a/lxqt-admin/patches/patch-CMakeLists.txt
+++ b/lxqt-admin/patches/patch-CMakeLists.txt
@@ -5,15 +5,13 @@ lxqt-admin-time depends on systemd
 
 --- CMakeLists.txt.orig	2019-02-25 22:10:39.000000000 +0000
 +++ CMakeLists.txt
-@@ -37,10 +37,9 @@ include(LXQtPreventInSourceBuilds)
- include(LXQtCompilerSettings NO_POLICY_SCOPE)
+@@ -38,8 +38,8 @@ include(LXQtCompilerSettings NO_POLICY_S
  include(LXQtTranslate)
  
--if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-+if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-     message(WARNING "${CMAKE_SYSTEM_NAME} is not supported by lxqt-admin-user")
+ if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+-    message(WARNING "${CMAKE_SYSTEM_NAME} is not supported by lxqt-admin-user")
      message(WARNING "${CMAKE_SYSTEM_NAME} is not supported by lxqt-admin-time")
++    add_subdirectory(lxqt-admin-user)
  else()
      add_subdirectory(lxqt-admin-user)
--    add_subdirectory(lxqt-admin-time)
- endif()
+     add_subdirectory(lxqt-admin-time)


Home | Main Index | Thread Index | Old Index