kde-frameworks: code style.

haikuports · Aug 3, 2018 · 412eb2c · 412eb2c
1 parent 4282289
commit 412eb2c
Show file tree

Hide file tree

Showing 27 changed files with 102 additions and 110 deletions.
diff --git a/kde-frameworks/attica/attica-5.47.0.recipe b/kde-frameworks/attica/attica-5.47.0.recipe
@@ -14,6 +14,10 @@ SOURCE_DIR="attica-$portVersion"
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/xdg/attica.categories keep-old
+	"
+
 PROVIDES="
 	attica$secondaryArchSuffix = $portVersion
 	lib:libKF5Attica$secondaryArchSuffix = $portVersion
@@ -44,10 +48,6 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/xdg/attica.categories keep-old
-	"
-
 BUILD()
 {
 	mkdir -p build

diff --git a/kde-frameworks/breeze-icons/breeze_icons-5.47.0.recipe b/kde-frameworks/breeze-icons/breeze_icons-5.47.0.recipe
@@ -16,7 +16,6 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	breeze_icons$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
@@ -26,7 +25,6 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
-
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:find

diff --git a/kde-frameworks/karchive/karchive-5.47.0.recipe b/kde-frameworks/karchive/karchive-5.47.0.recipe
@@ -14,6 +14,10 @@ CHECKSUM_SHA256="2bf47e3070fce8f6f269727279c28dd951dc31cd28e2715c90add3cd835b4a8
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/xdg/karchive.categories keep-old
+	"
+
 PROVIDES="
 	karchive$secondaryArchSuffix = $portVersion
 	lib:libkf5archive$secondaryArchSuffix = $portVersion compat >= 5
@@ -59,10 +63,6 @@ BUILD()
 	make $jobArgs
 }
 
-GLOBAL_WRITABLE_FILES="
-	settings/xdg/karchive.categories keep-old
-	"
-
 INSTALL()
 {
 	cd build

diff --git a/kde-frameworks/kauth/kauth-5.47.0.recipe b/kde-frameworks/kauth/kauth-5.47.0.recipe
@@ -12,6 +12,11 @@ CHECKSUM_SHA256="c3c3720c27b59d9278a912ad2397c34854b747de0aac2da446d909b2520e2bc
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/dbus-1/system.d/org.kde.kf5auth.conf keep-old
+	settings/xdg/kauth.categories keep-old
+	"
+
 PROVIDES="
 	kauth$secondaryArchSuffix = $portVersion
 	lib:libKF5Auth$secondaryArchSuffix = $portVersion compat >= 5
@@ -44,11 +49,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/dbus-1/system.d/org.kde.kf5auth.conf keep-old
-	settings/xdg/kauth.categories keep-old
-	"
-
 BUILD()
 {
 	mkdir -p build

diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.47.0.recipe b/kde-frameworks/kbookmarks/kbookmarks-5.47.0.recipe
@@ -14,6 +14,10 @@ CHECKSUM_SHA256="410ed6dffc27e4677b6e70a29025009205d4a3eeafa8d67bdeaab68c6518363
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/xdg/kbookmarks.categories keep-old
+	"
+
 PROVIDES="
 	kbookmarks$secondaryArchSuffix = $portVersion
 	lib:libKF5Bookmarks$secondaryArchSuffix = $portVersion compat >= 5
@@ -68,10 +72,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/xdg/kbookmarks.categories keep-old
-	"
-
 BUILD()
 {
 	mkdir -p build
@@ -96,6 +96,7 @@ INSTALL()
 		$dataDir/Qt5/mkspecs \
 		$developDir
 }
+
 TEST()
 {
 	cd build

diff --git a/kde-frameworks/kcodecs/kcodecs-5.47.0.recipe b/kde-frameworks/kcodecs/kcodecs-5.47.0.recipe
@@ -15,6 +15,10 @@ CHECKSUM_SHA256="ce1ee75c5c90a354afd19354646b58fe8de462210a00e3cf5873ca5d113469b
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/xdg/kcodecs.categories keep-old
+	"
+
 PROVIDES="
 	kcodecs$secondaryArchSuffix = $portVersion
 	lib:libKF5Codecs$secondaryArchSuffix = $portVersion compat >= 5
@@ -44,10 +48,6 @@ BUILD_PREREQUIRES="
 	cmd:g++$secondaryArchSuffix
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/xdg/kcodecs.categories keep-old
-	"
-
 BUILD()
 {
 	mkdir -p build

diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.47.0.recipe b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.47.0.recipe
@@ -12,6 +12,10 @@ CHECKSUM_SHA256="daad3b34c1b1ff75477ec6718a2fed3a8a2463bf8c265f956fcb35d43d3a4e2
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/xdg/kconfigwidgets.categories keep-old
+	"
+
 PROVIDES="
 	kconfigwidgets$secondaryArchSuffix = $portVersion
 	cmd:preparetips5$secondaryArchSuffix = $portVersion
@@ -59,10 +63,6 @@ BUILD_PREREQUIRES="
 	cmd:python2
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/xdg/kconfigwidgets.categories keep-old
-	"
-
 BUILD()
 {
 	# disable docs generation until libxml package is fixed

diff --git a/kde-frameworks/kcrash/kcrash-5.47.0.recipe b/kde-frameworks/kcrash/kcrash-5.47.0.recipe
@@ -12,6 +12,10 @@ PATCHES="kcrash-$portVersion.patchset"
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/xdg/kcrash.categories keep-old
+	"
+
 PROVIDES="
 	kcrash$secondaryArchSuffix = $portVersion
 	lib:libKF5Crash$secondaryArchSuffix = $portVersion compat >= 5
@@ -48,10 +52,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/xdg/kcrash.categories keep-old
-	"
-
 BUILD()
 {
 	mkdir -p build

diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.47.0.recipe b/kde-frameworks/kdbusaddons/kdbusaddons-5.47.0.recipe
@@ -11,6 +11,10 @@ CHECKSUM_SHA256="809525760d7638c691cedb0af12bf3b0873a78cee3f0c2a822ebcee34001dee
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/xdg/kdbusaddons.categories keep-old
+	"
+
 PROVIDES="
 	kdbusaddons$secondaryArchSuffix = $portVersion
 	cmd:kquitapp5$secondaryArchSuffix = $portVersion
@@ -42,10 +46,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/xdg/kdbusaddons.categories keep-old
-	"
-
 BUILD()
 {
 	mkdir -p build

diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.47.0.recipe b/kde-frameworks/kdelibs4support/kdelibs4support-5.47.0.recipe
@@ -24,6 +24,17 @@ PATCHES="kdelibs4support-$portVersion.patchset"
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/xdg/colors/40.colors keep-old
+	settings/xdg/colors/Oxygen.colors keep-old
+	settings/xdg/colors/Rainbow.colors keep-old
+	settings/xdg/colors/Royal.colors keep-old
+	settings/xdg/colors/Web.colors keep-old
+	settings/xdg/kdebug.areas keep-old
+	settings/xdg/kdebugrc keep-old
+	settings/xdg/ksslcalist keep-old
+	"
+
 PROVIDES="
 	kdelibs4support$secondaryArchSuffix = $portVersion
 	cmd:kf5_config$secondaryArchSuffix = $portVersion
@@ -132,17 +143,6 @@ BUILD_PREREQUIRES="
 	cmd:python2
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/xdg/colors/40.colors keep-old
-	settings/xdg/colors/Oxygen.colors keep-old
-	settings/xdg/colors/Rainbow.colors keep-old
-	settings/xdg/colors/Royal.colors keep-old
-	settings/xdg/colors/Web.colors keep-old
-	settings/xdg/kdebug.areas keep-old
-	settings/xdg/kdebugrc keep-old
-	settings/xdg/ksslcalist keep-old
-	"
-
 BUILD()
 {
 	# disable docs generation until libxml package is fixed
@@ -177,4 +177,3 @@ TEST()
 	cd build
 	make test
 }
-
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.47.0.recipe b/kde-frameworks/kfilemetadata/kfilemetadata-5.47.0.recipe
@@ -13,6 +13,10 @@ CHECKSUM_SHA256="e0e8b6d5a89ce60be3aa0f8dc61d92a2e43e3e457436bc01c591ea5329f2bbb
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/xdg/kfilemetadata.categories keep-old
+	"
+
 PROVIDES="
 	kfilemetadata$secondaryArchSuffix = $portVersion
 	lib:libKF5FileMetadata$secondaryArchSuffix = $portVersion compat >= 5
@@ -49,10 +53,6 @@ BUILD_PREREQUIRES="
 	cmd:python2
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/xdg/kfilemetadata.categories keep-old
-	"
-
 BUILD()
 {
 	mkdir -p build

diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.47.0.recipe b/kde-frameworks/kglobalaccel/kglobalaccel-5.47.0.recipe
@@ -12,6 +12,10 @@ CHECKSUM_SHA256="24fb6397cf761818f4b90db32d7a418b3ae37c5d235e0e8dff8f6a7c078099b
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/xdg/kglobalaccel.categories keep-old
+	"
+
 PROVIDES="
 	kglobalaccel$secondaryArchSuffix = $portVersion
 	cmd:kglobalaccel5$secondaryArchSuffix = $portVersion
@@ -66,10 +70,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/xdg/kglobalaccel.categories keep-old
-	"
-
 BUILD()
 {
 	mkdir -p build

diff --git a/kde-frameworks/kholidays/kholidays-5.47.0.recipe b/kde-frameworks/kholidays/kholidays-5.47.0.recipe
@@ -56,7 +56,6 @@ BUILD()
 	make $jobArgs
 }
 
-
 INSTALL()
 {
 	cd build

diff --git a/kde-frameworks/khtml/khtml-5.47.0.recipe b/kde-frameworks/khtml/khtml-5.47.0.recipe
@@ -13,11 +13,15 @@ CHECKSUM_SHA256="d374e7ee2a3a8d5f98b54c0d752ed6377a38da667b695ba8efa98d8df8eed32
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/xdg/khtmlrc keep-old
+	settings/xdg/khtml.categories keep-old
+	"
+
 PROVIDES="
 	khtml$secondaryArchSuffix = $portVersion
 	lib:libKF5KHtml$secondaryArchSuffix = $portVersion compat >= 5
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
@@ -69,7 +73,6 @@ PROVIDES_devel="
 	khtml${secondaryArchSuffix}_devel = $portVersion
 	devel:libKF5KHtml$secondaryArchSuffix = $portVersion compat >= 5
 	"
-
 REQUIRES_devel="
 	khtml$secondaryArchSuffix == $portVersion base
 	"
@@ -115,7 +118,6 @@ BUILD_REQUIRES="
 	devel:libssl$secondaryArchSuffix >= 1.0.0
 	devel:libz$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
@@ -125,11 +127,6 @@ BUILD_PREREQUIRES="
 	cmd:python2
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/xdg/khtmlrc keep-old
-	settings/xdg/khtml.categories keep-old
-	"
-
 BUILD()
 {
 	mkdir -p build

diff --git a/kde-frameworks/kimageformats/kimageformats-5.47.0.recipe b/kde-frameworks/kimageformats/kimageformats-5.47.0.recipe
@@ -23,6 +23,7 @@ REQUIRES="
 	lib:libKF5KIOCore$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel

diff --git a/kde-frameworks/kio/kio-5.47.0.recipe b/kde-frameworks/kio/kio-5.47.0.recipe
@@ -21,6 +21,11 @@ PATCHES="kio-$portVersion.patchset"
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/xdg/accept-languages.codes keep-old
+	settings/xdg/kshorturifilterrc keep-old
+	"
+
 PROVIDES="
 	kio$secondaryArchSuffix = $portVersion
 	cmd:kcookiejar5$secondaryArchSuffix = $portVersion
@@ -121,11 +126,6 @@ BUILD_PREREQUIRES="
 	cmd:python2
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/xdg/accept-languages.codes keep-old
-	settings/xdg/kshorturifilterrc keep-old
-	"
-
 BUILD()
 {
 	mkdir -p build

diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.47.0.recipe b/kde-frameworks/kitemmodels/kitemmodels-5.47.0.recipe
@@ -26,6 +26,10 @@ CHECKSUM_SHA256="d9c6ac115811bd6796faba33320a9231c7a0fa47ddb15c80312ffcb8c14b15f
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+GLOBAL_WRITABLE_FILES="
+	settings/xdg/kitemmodels.categories keep-old
+	"
+
 PROVIDES="
 	kitemmodels$secondaryArchSuffix = $portVersion
 	lib:libKF5ItemModels$secondaryArchSuffix = $portVersion compat >= 5
@@ -57,10 +61,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/xdg/kitemmodels.categories keep-old
-	"
-
 BUILD()
 {
 	mkdir -p build
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,6 @@ BUILD() @@
     	make $jobArgs
     }
     INSTALL()
     {
     	cd build
@@ Expand Down @@