diff options
| author | markd <markd@pkgsrc.org> | 2017-06-26 11:02:30 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2017-06-26 11:02:30 +0000 |
| commit | a7cda40f394e071308069297813ee74d4a1e0893 (patch) | |
| tree | 21f849c402626c74480c166b708cda14f6920497 /x11 | |
| parent | 31263a41225b03b76120cef5bdb06f5e4b91921c (diff) | |
| download | pkgsrc-a7cda40f394e071308069297813ee74d4a1e0893.tar.gz | |
Revert two presumably unintended patches.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kde-workspace4/distinfo | 6 | ||||
| -rw-r--r-- | x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp | 6 | ||||
| -rw-r--r-- | x11/kde-workspace4/patches/patch-startkde.cmake | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/x11/kde-workspace4/distinfo b/x11/kde-workspace4/distinfo index 64f5f332b5f..ba806667082 100644 --- a/x11/kde-workspace4/distinfo +++ b/x11/kde-workspace4/distinfo @@ -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) = 13553668 bytes 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_digital-clock_clock.cpp) = dd052f6c36fbd62dd5 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 diff --git a/x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp b/x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp index 40fa7dc3232..bd262a2a63b 100644 --- a/x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp +++ b/x11/kde-workspace4/patches/patch-kdm_kcm_main.cpp @@ -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" )); + diff --git a/x11/kde-workspace4/patches/patch-startkde.cmake b/x11/kde-workspace4/patches/patch-startkde.cmake index be3ed1e19b1..ecdc2e38a2b 100644 --- a/x11/kde-workspace4/patches/patch-startkde.cmake +++ b/x11/kde-workspace4/patches/patch-startkde.cmake @@ -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;; |