pkgsrc-Changes archive

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

CVS commit: pkgsrc/x11/kde-baseapps4



Module Name:    pkgsrc
Committed By:   markd
Date:           Thu Feb 11 21:38:08 UTC 2021

Modified Files:
        pkgsrc/x11/kde-baseapps4: Makefile PLIST distinfo
Added Files:
        pkgsrc/x11/kde-baseapps4/patches: patch-CMakeLists.txt

Log Message:
kde-baseapps4: don't build dolphin


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/x11/kde-baseapps4/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/kde-baseapps4/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/kde-baseapps4/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/kde-baseapps4/patches/patch-CMakeLists.txt

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-baseapps4/Makefile
diff -u pkgsrc/x11/kde-baseapps4/Makefile:1.60 pkgsrc/x11/kde-baseapps4/Makefile:1.61
--- pkgsrc/x11/kde-baseapps4/Makefile:1.60      Fri Jan  1 08:24:58 2021
+++ pkgsrc/x11/kde-baseapps4/Makefile   Thu Feb 11 21:38:08 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2021/01/01 08:24:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.61 2021/02/11 21:38:08 markd Exp $
 
 DISTNAME=      kde-baseapps-15.12.0
 PKGNAME=       ${DISTNAME:S/-1/4-1/}
-PKGREVISION=   27
+PKGREVISION=   28
 CATEGORIES=    x11
 COMMENT=       Base modules for the KDE 4 integrated X11 desktop
 MASTER_SITES=  ${MASTER_SITE_KDE:=applications/15.12.0/src/}
@@ -13,8 +13,8 @@ CONFLICTS=    konq-plugins-[0-9]*
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
-REPLACE_RUBY+= dolphin/src/settings/services/servicemenuinstallation
-REPLACE_RUBY+= dolphin/src/settings/services/servicemenudeinstallation
+#REPLACE_RUBY+=        dolphin/src/settings/services/servicemenuinstallation
+#REPLACE_RUBY+=        dolphin/src/settings/services/servicemenudeinstallation
 
 REPLACE_INTERPRETER+=  xdg-open
 REPLACE.xdg-open.old=  .*/bin/env xdg-open
@@ -23,22 +23,22 @@ REPLACE_FILES.xdg-open=     lib/konq/Templat
 
 CHECK_INTERPRETER_SKIP=        share/kde/templates/.source/Program.desktop
 
-.include "../../lang/ruby/replace.mk"
+#.include "../../lang/ruby/replace.mk"
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/qimageblitz/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/libbaloo4/buildlink3.mk"
-.include "../../sysutils/baloo-widgets/buildlink3.mk"
-.include "../../sysutils/kfilemetadata/buildlink3.mk"
+#.include "../../sysutils/libbaloo4/buildlink3.mk"
+#.include "../../sysutils/baloo-widgets/buildlink3.mk"
+#.include "../../sysutils/kfilemetadata/buildlink3.mk"
 .include "../../textproc/xapian/buildlink3.mk"
 .include "../../x11/libkactivities4/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../x11/kde-runtime4/buildlink3.mk"
-.include "../../x11/kde-workspace4/buildlink3.mk"
-.include "../../lang/ruby/buildlink3.mk"
+#.include "../../x11/kde-workspace4/buildlink3.mk"
+#.include "../../lang/ruby/buildlink3.mk"
 .include "../../www/tidy/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/kde-baseapps4/PLIST
diff -u pkgsrc/x11/kde-baseapps4/PLIST:1.9 pkgsrc/x11/kde-baseapps4/PLIST:1.10
--- pkgsrc/x11/kde-baseapps4/PLIST:1.9  Sun Jan 10 19:03:55 2016
+++ pkgsrc/x11/kde-baseapps4/PLIST      Thu Feb 11 21:38:08 2021
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2016/01/10 19:03:55 markd Exp $
-bin/dolphin4
+@comment $NetBSD: PLIST,v 1.10 2021/02/11 21:38:08 markd Exp $
 bin/fsview
 bin/kbookmarkmerger
 bin/kdepasswd
@@ -10,8 +9,6 @@ bin/kfmclient
 bin/konqueror
 bin/nspluginscan
 bin/nspluginviewer
-bin/servicemenudeinstallation
-bin/servicemenuinstallation
 include/knewmenu.h
 include/konq_dndpopupmenuplugin.h
 include/konq_events.h
@@ -33,13 +30,8 @@ lib/kde4/akregatorkonqfeedicon.so
 lib/kde4/autorefresh.so
 lib/kde4/babelfishplugin.so
 lib/kde4/dirfilterplugin.so
-lib/kde4/dolphinpart.so
 lib/kde4/domtreeviewerplugin.so
 lib/kde4/fsviewpart.so
-lib/kde4/kcm_dolphingeneral.so
-lib/kde4/kcm_dolphinnavigation.so
-lib/kde4/kcm_dolphinservices.so
-lib/kde4/kcm_dolphinviewmodes.so
 lib/kde4/kcm_history.so
 lib/kde4/kcm_kio.so
 lib/kde4/kcm_konq.so
@@ -52,7 +44,6 @@ lib/kde4/kded_konqy_preloader.so
 lib/kde4/khtmlkttsdplugin.so
 lib/kde4/khtmlsettingsplugin.so
 lib/kde4/kimgallery.so
-lib/kde4/kio_filenamesearch.so
 lib/kde4/konq_aboutpage.so
 lib/kde4/konq_shellcmdplugin.so
 lib/kde4/konq_sidebar.so
@@ -73,13 +64,9 @@ lib/kde4/uachangerplugin.so
 lib/kde4/validatorsplugin.so
 lib/kde4/webarchiverplugin.so
 lib/kde4/webarchivethumbnail.so
-lib/libdolphinprivate4.so
-lib/libdolphinprivate4.so.4
-lib/libdolphinprivate4.so.${KDELIBSVER}
 lib/libkbookmarkmodel_private.so
 lib/libkbookmarkmodel_private.so.4
 lib/libkbookmarkmodel_private.so.${KDELIBSVER}
-lib/libkdeinit4_dolphin4.so
 lib/libkdeinit4_keditbookmarks.so
 lib/libkdeinit4_kfmclient.so
 lib/libkdeinit4_konqueror.so
@@ -96,7 +83,6 @@ man/man1/kfind.1
 share/appdata/kfind.appdata.xml
 share/appdata/konqueror.appdata.xml
 share/applications/kde4/Home.desktop
-share/applications/kde4/dolphin.desktop
 share/applications/kde4/kdepasswd.desktop
 share/applications/kde4/keditbookmarks.desktop
 share/applications/kde4/kfind.desktop
@@ -177,8 +163,6 @@ share/icons/oxygen/64x64/actions/validat
 share/icons/oxygen/scalable/actions/htmlvalidator.svgz
 share/icons/oxygen/scalable/actions/validators.svgz
 share/kde/apps/akregator/pics/feed.png
-share/kde/apps/dolphin/dolphinui.rc
-share/kde/apps/dolphinpart/dolphinpart.rc
 share/kde/apps/dolphinpart/kpartplugins/dirfilterplugin.desktop
 share/kde/apps/dolphinpart/kpartplugins/dirfilterplugin.rc
 share/kde/apps/dolphinpart/kpartplugins/kimgalleryplugin.desktop
@@ -296,19 +280,12 @@ share/kde/apps/kwebkitpart/kpartplugins/
 share/kde/apps/kwebkitpart/kpartplugins/uachangerplugin.rc
 share/kde/apps/nsplugin/nspluginpart.rc
 share/kde/autostart/konqy_preload.desktop
-share/kde/config.kcfg/dolphin_compactmodesettings.kcfg
-share/kde/config.kcfg/dolphin_detailsmodesettings.kcfg
-share/kde/config.kcfg/dolphin_directoryviewpropertysettings.kcfg
-share/kde/config.kcfg/dolphin_generalsettings.kcfg
-share/kde/config.kcfg/dolphin_iconsmodesettings.kcfg
-share/kde/config.kcfg/dolphin_versioncontrolsettings.kcfg
 share/kde/config.kcfg/kcm_useraccount.kcfg
 share/kde/config.kcfg/kcm_useraccount_pass.kcfg
 share/kde/config.kcfg/keditbookmarks.kcfg
 share/kde/config.kcfg/konqueror.kcfg
 share/kde/config.kcfg/validators.kcfg
 share/kde/config/konqsidebartngrc
-share/kde/config/servicemenu.knsrc
 share/kde/config/translaterc
 share/kde/templates/.source/CAMERA-Device.desktop
 share/kde/templates/.source/CDROM-Device.desktop
@@ -342,16 +319,10 @@ share/kde4/services/ServiceMenus/imageco
 share/kde4/services/bookmarks.desktop
 share/kde4/services/cache.desktop
 share/kde4/services/cookies.desktop
-share/kde4/services/dolphinpart.desktop
 share/kde4/services/ebrowsing.desktop
 share/kde4/services/filebehavior.desktop
-share/kde4/services/filenamesearch.protocol
 share/kde4/services/fsview_part.desktop
 share/kde4/services/kcm_useraccount.desktop
-share/kde4/services/kcmdolphingeneral.desktop
-share/kde4/services/kcmdolphinnavigation.desktop
-share/kde4/services/kcmdolphinservices.desktop
-share/kde4/services/kcmdolphinviewmodes.desktop
 share/kde4/services/kcmhistory.desktop
 share/kde4/services/kcmkonqyperformance.desktop
 share/kde4/services/kcmperformance.desktop
@@ -412,7 +383,6 @@ share/kde4/services/useragentstrings/saf
 share/kde4/services/useragentstrings/w3moncurrent.desktop
 share/kde4/services/useragentstrings/wgetoncurrent.desktop
 share/kde4/services/webarchivethumbnail.desktop
-share/kde4/servicetypes/fileviewversioncontrolplugin.desktop
 share/kde4/servicetypes/konqaboutpage.desktop
 share/kde4/servicetypes/konqdndpopupmenuplugin.desktop
 share/kde4/servicetypes/konqpopupmenuplugin.desktop

Index: pkgsrc/x11/kde-baseapps4/distinfo
diff -u pkgsrc/x11/kde-baseapps4/distinfo:1.13 pkgsrc/x11/kde-baseapps4/distinfo:1.14
--- pkgsrc/x11/kde-baseapps4/distinfo:1.13      Mon Feb 20 09:35:17 2017
+++ pkgsrc/x11/kde-baseapps4/distinfo   Thu Feb 11 21:38:08 2021
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.13 2017/02/20 09:35:17 wiz Exp $
+$NetBSD: distinfo,v 1.14 2021/02/11 21:38:08 markd Exp $
 
 SHA1 (kde-baseapps-15.12.0.tar.xz) = 4b111c8ab4982edb661674ec1045b83537997642
 RMD160 (kde-baseapps-15.12.0.tar.xz) = 89b15d1f980a6bc2cf343bec154062e76684d1ea
 SHA512 (kde-baseapps-15.12.0.tar.xz) = 67dfcfc46d0c9f10c6071927833d9a16c5c2696a16c1be7315a28d4c33ceb402c1505a613ff6222635771f55e6e71cb5df954ec6f477ee0ab199e8727aea8ed4
 Size (kde-baseapps-15.12.0.tar.xz) = 2050764 bytes
+SHA1 (patch-CMakeLists.txt) = f8f5fbf60388d057f845264f4c2759c90b5bc7c3
 SHA1 (patch-dolphin_src_CMakeLists.txt) = f524104916a8de097309fbc3d775b2ff7f9b13a8
 SHA1 (patch-dolphin_src_dolphin.desktop) = c97d4e0e9ac393b87f62fa88d4414944e18a014d
 SHA1 (patch-dolphin_src_kitemviews_private_kdirectorycontentscounterworker.cpp) = db1d193f2413ae1aa53dbc979076ba76d485883f

Added files:

Index: pkgsrc/x11/kde-baseapps4/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/x11/kde-baseapps4/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Thu Feb 11 21:38:08 2021
+++ pkgsrc/x11/kde-baseapps4/patches/patch-CMakeLists.txt       Thu Feb 11 21:38:08 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2021/02/11 21:38:08 markd Exp $
+
+dont build dolphin
+
+--- CMakeLists.txt.orig        2015-12-08 07:04:21.000000000 +0000
++++ CMakeLists.txt
+@@ -37,7 +37,7 @@ if ( KActivities_FOUND )
+ endif ( KActivities_FOUND )
+ 
+ add_subdirectory( lib )
+-add_subdirectory( dolphin )
++#add_subdirectory( dolphin )
+ add_subdirectory( kdialog )
+ add_subdirectory( keditbookmarks )
+ add_subdirectory( konqueror )



Home | Main Index | Thread Index | Old Index