CVS commit: pkgsrc/x11/kde-workspace4

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Mon Jun 26 11:02:30 UTC 2017

Modified Files:
        pkgsrc/x11/kde-workspace4: distinfo
        pkgsrc/x11/kde-workspace4/patches: patch-kdm_kcm_main.cpp
            patch-startkde.cmake

Log Message:
Revert two presumably unintended patches.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/kde-workspace4/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/x11/kde-workspace4/patches/patch-startkde.cmake

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

Modified files:

Index: pkgsrc/x11/kde-workspace4/distinfo
diff -u pkgsrc/x11/kde-workspace4/distinfo:1.18 pkgsrc/x11/kde-workspace4/distinfo:1.19
--- pkgsrc/x11/kde-workspace4/distinfo:1.18     Sun Jun 25 19:58:04 2017
+++ pkgsrc/x11/kde-workspace4/distinfo  Mon Jun 26 11:02:30 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2017/06/25 19:58:04 youri Exp $
+$NetBSD: distinfo,v 1.19 2017/06/26 11:02:30 markd Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -19,7 +19,7 @@ Size (kde-workspace-4.11.22.tar.xz) = 13
 SHA1 (patch-kcontrol_keyboard_xkb_rules.cpp) = e4569e0671c55e990cbc0913e5abaead046a8e71
 SHA1 (patch-kcontrol_randr_randroutput.cpp) = 6f9e6f18007023941018d2088a585c2ab30a7299
 SHA1 (patch-kdm_config.def) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
-SHA1 (patch-kdm_kcm_main.cpp) = 1e53580285f4201e328f6596544c4a6f807ef751
+SHA1 (patch-kdm_kcm_main.cpp) = bb692c83fa189342105744cc9c3c180b970571b7
 SHA1 (patch-kdm_kfrontend_CMakeLists.txt) = 0b0c541c7305d31e01a45f0a6a7f5ddb2d2e57fe
 SHA1 (patch-kdm_kfrontend_genkdmconf.c) = 28829bb285df6a3d252eb1bf7043cbd44e10500f
 SHA1 (patch-kinfocenter_Modules_nics_nic.cpp) = 0f7e846eac8d694e0ab6018d4f4c571b4e0c84db
@@ -47,4 +47,4 @@ SHA1 (patch-plasma_generic_applets_digit
 SHA1 (patch-plasma_generic_dataengines_rss_CMakeLists.txt) = 6a12cb3cb54a8b1899f29e7f50a1171862dce66e
 SHA1 (patch-plasma_generic_dataengines_time_solarsystem.h) = 474bbf3bc9f9bc0c75772f01218c1739d49fd31c
 SHA1 (patch-plasma_generic_dataengines_time_timesource.h) = 85ccf0ed379c94e174880bc239daee60afccc788
-SHA1 (patch-startkde.cmake) = 0068ac6836a668eaee50d3641f64a3ef843f1a34
+SHA1 (patch-startkde.cmake) = 36421affc2af12a50623ecfd4f3b0cb320796634

Index: pkgsrc/x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp
diff -u pkgsrc/x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp:1.2 pkgsrc/x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp:1.3
--- pkgsrc/x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp:1.2        Sun Jun 25 19:58:04 2017
+++ pkgsrc/x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp    Mon Jun 26 11:02:30 2017
@@ -1,14 +1,14 @@
-$NetBSD: patch-kdm_kcm_main.cpp,v 1.2 2017/06/25 19:58:04 youri Exp $
+$NetBSD: patch-kdm_kcm_main.cpp,v 1.3 2017/06/26 11:02:30 markd Exp $
 
 Allow $PKG_SYSCONFDIR/kdm/kdmrc to override the one under $PREFIX
 
---- kdm/kcm/main.cpp.orig      2015-08-12 07:03:15.000000000 +0000
+--- kdm/kcm/main.cpp.orig      2010-05-27 17:23:09.000000000 +0000
 +++ kdm/kcm/main.cpp
 @@ -281,8 +281,12 @@ KConfig *KDModule::createTempConfig()
      pTempConfigFile->open();
      QString tempConfigName = pTempConfigFile->fileName();
  
-+    QFile confFile (QString::fromLatin1( "/usr/pkg/etc" "/kdm/kdmrc" ));
++    QFile confFile (QString::fromLatin1( "@PKG_SYSCONFDIR@" "/kdm/kdmrc" ));
 +    if ( !confFile.exists() )
 +      confFile.setFileName (QString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
 +

Index: pkgsrc/x11/kde-workspace4/patches/patch-startkde.cmake
diff -u pkgsrc/x11/kde-workspace4/patches/patch-startkde.cmake:1.4 pkgsrc/x11/kde-workspace4/patches/patch-startkde.cmake:1.5
--- pkgsrc/x11/kde-workspace4/patches/patch-startkde.cmake:1.4  Sun Jun 25 19:58:04 2017
+++ pkgsrc/x11/kde-workspace4/patches/patch-startkde.cmake      Mon Jun 26 11:02:30 2017
@@ -1,12 +1,12 @@
-$NetBSD: patch-startkde.cmake,v 1.4 2017/06/25 19:58:04 youri Exp $
+$NetBSD: patch-startkde.cmake,v 1.5 2017/06/26 11:02:30 markd Exp $
 
---- startkde.cmake.orig        2015-08-12 07:03:15.000000000 +0000
+--- startkde.cmake.orig        2013-03-01 06:32:24.000000000 +0000
 +++ startkde.cmake
 @@ -29,6 +29,12 @@ else
    qdbus=qdbus
  fi
  
-+qtbindir=/usr/pkg/qt4/bin
++qtbindir=@QTDIR@/bin
 +case $PATH in
 +  $qtbindir|$qtbindir:*|*:$qtbindir|*:$qtbindir:*) ;;
 +  *) PATH=$qtbindir:$PATH; export PATH;;