metapackage

4 files changed, 15 insertions, 117 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03d8f6fb5661..8e075c2e4622 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,8 @@
 pkgbase = breeze-kde4
-	pkgdesc = Artwork, styles and assets for the Breeze visual style for the Plasma Desktop
+	pkgdesc = metapackage - migrate to breeze
 	pkgver = 5.15.4
-	pkgrel = 1
-	url = https://www.kde.org/workspaces/plasmadesktop/
-	arch = x86_64
-	groups = plasma
-	license = LGPL
-	makedepends = extra-cmake-modules
-	makedepends = kcmutils
-	makedepends = automoc4
-	depends = frameworkintegration
-	depends = kdecoration
-	depends = breeze-icons
-	depends = kwayland
-	depends = hicolor-icon-theme
-	depends = kdelibs
-	optdepends = kcmutils: for breeze-settings
-	source = https://download.kde.org/stable/plasma/5.15.4/breeze-5.15.4.tar.xz
-	source = https://download.kde.org/stable/plasma/5.15.4/breeze-5.15.4.tar.xz.sig
-	source = 386d3b8ed1e0595c9fc6e21643ff748402171429.patch
-	validpgpkeys = 2D1D5B0588357787DE9EE225EC94D18F7F05997E
-	validpgpkeys = 0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D
-	validpgpkeys = D07BD8662C56CB291B316EB2F5675605C74E02CF
-	validpgpkeys = 1FA881591C26B276D7A5518EEAAF29B42A678C20
-	sha256sums = e5b174d9509f3dcb85b0865b8bc8d40e2e2fb0f9373eda1877e5874a9c456958
-	sha256sums = SKIP
-	sha256sums = 59a8b0c2b469903e818cb17c32a9ce267a0359a1c43f81089bc4d363d8913a71
+	pkgrel = 2
+	arch = any
 
 pkgname = breeze-kde4
-
+	depends = breeze
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/386d3b8ed1e0595c9fc6e21643ff748402171429.patch b/386d3b8ed1e0595c9fc6e21643ff748402171429.patch
deleted file mode 100644
index 53ca7e350ddc..000000000000
--- a/386d3b8ed1e0595c9fc6e21643ff748402171429.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 386d3b8ed1e0595c9fc6e21643ff748402171429 Mon Sep 17 00:00:00 2001
-From: Vlad Zagorodniy <vladzzag@gmail.com>
-Date: Tue, 2 Apr 2019 16:01:19 +0300
-Subject: [PATCH] Fix build with Qt 4
-
-Reviewers: #plasma, davidedmundson, fvogt
-
-Reviewed By: #plasma, davidedmundson, fvogt
-
-Subscribers: fvogt, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D20201
----
- kstyle/breezewindowmanager.cpp | 11 +++--------
- 1 file changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/kstyle/breezewindowmanager.cpp b/kstyle/breezewindowmanager.cpp
-index aba29eef..5ca3fea5 100644
---- a/kstyle/breezewindowmanager.cpp
-+++ b/kstyle/breezewindowmanager.cpp
-@@ -895,20 +895,15 @@ namespace Breeze
-         // connection
-         auto connection( Helper::connection() );
- 
--        #if QT_VERSION >= 0x050300
--        const qreal dpiRatio = window->devicePixelRatio();
--        #else
--        const qreal dpiRatio = 1;
--        #endif
--
-         #if BREEZE_USE_KDE4
-         auto net_connection = QX11Info::display();
-+        const QPoint native = position;
-         #else
-         auto net_connection = connection;
--        #endif
--
-+        const qreal dpiRatio = window->devicePixelRatio();
-         const QPoint origin = window->screen()->geometry().topLeft();
-         const QPoint native = (position - origin) * dpiRatio + origin;
-+        #endif
- 
-         xcb_ungrab_pointer( connection, XCB_TIME_CURRENT_TIME );
-         NETRootInfo( net_connection, NET::WMMoveResize ).moveResizeRequest(
diff --git a/PKGBUILD b/PKGBUILD
index 4f73ce05744a..ead781c9a053 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,12 @@
-# Maintainer: Felix Yan <felixonmars@archlinux.org>
-# Maintainer: Antonio Rojas <arojas@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Maintainer:
 
-pkgname=breeze-kde4
+_newpkg='breeze'
+pkgname='breeze-kde4'
 pkgver=5.15.4
-pkgrel=1
-arch=(x86_64)
-pkgdesc='Artwork, styles and assets for the Breeze visual style for the Plasma Desktop'
-url='https://www.kde.org/workspaces/plasmadesktop/'
-license=(LGPL)
-depends=(frameworkintegration kdecoration breeze-icons kwayland hicolor-icon-theme kdelibs)
-makedepends=(extra-cmake-modules kcmutils automoc4)
-optdepends=('kcmutils: for breeze-settings')
-groups=(plasma)
-source=("https://download.kde.org/stable/plasma/$pkgver/breeze-$pkgver.tar.xz"{,.sig}
-        "386d3b8ed1e0595c9fc6e21643ff748402171429.patch")
-sha256sums=('e5b174d9509f3dcb85b0865b8bc8d40e2e2fb0f9373eda1877e5874a9c456958'
-            'SKIP'
-            '59a8b0c2b469903e818cb17c32a9ce267a0359a1c43f81089bc4d363d8913a71')
-validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell <jr@jriddell.org>
-              '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah@kde.org>
-              'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson <davidedmundson@kde.org>
-              '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart@gmail.com>
-
-prepare() {
-  mkdir -p build
-  cd breeze-$pkgver
-  patch -p1 < ../386d3b8ed1e0595c9fc6e21643ff748402171429.patch
-}
-
-build() {
-  cd build
-  cmake ../breeze-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DUSE_KDE4=ON \
-    -DBUILD_TESTING=OFF
-  make
-}
+pkgrel=2
+pkgdesc="metapackage - migrate to $_newpkg"
+arch=('any')
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  # needed for pure Qt4 apps
-  install -d "$pkgdir"/usr/lib/qt4/plugins/styles
-  ln -s /usr/lib/kde4/plugins/styles/breeze.so "$pkgdir"/usr/lib/qt4/plugins/styles
+  depends=("$_newpkg")
 }