[arch-commits] Commit in kcalc/repos (10 files)
Antonio Rojas
arojas at archlinux.org
Wed Mar 16 16:32:21 UTC 2016
Date: Wednesday, March 16, 2016 @ 17:32:20
Author: arojas
Revision: 261921
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kcalc/repos/extra-i686/PKGBUILD
(from rev 261920, kcalc/trunk/PKGBUILD)
kcalc/repos/extra-i686/kcalc-qt5.6.patch
(from rev 261920, kcalc/trunk/kcalc-qt5.6.patch)
kcalc/repos/extra-i686/kcalc.install
(from rev 261920, kcalc/trunk/kcalc.install)
kcalc/repos/extra-x86_64/PKGBUILD
(from rev 261920, kcalc/trunk/PKGBUILD)
kcalc/repos/extra-x86_64/kcalc-qt5.6.patch
(from rev 261920, kcalc/trunk/kcalc-qt5.6.patch)
kcalc/repos/extra-x86_64/kcalc.install
(from rev 261920, kcalc/trunk/kcalc.install)
Deleted:
kcalc/repos/extra-i686/PKGBUILD
kcalc/repos/extra-i686/kcalc.install
kcalc/repos/extra-x86_64/PKGBUILD
kcalc/repos/extra-x86_64/kcalc.install
--------------------------------+
/PKGBUILD | 88 +++++++++++++++++++++++++++++++++++++++
/kcalc.install | 26 +++++++++++
extra-i686/PKGBUILD | 39 -----------------
extra-i686/kcalc-qt5.6.patch | 11 ++++
extra-i686/kcalc.install | 13 -----
extra-x86_64/PKGBUILD | 39 -----------------
extra-x86_64/kcalc-qt5.6.patch | 11 ++++
extra-x86_64/kcalc.install | 13 -----
8 files changed, 136 insertions(+), 104 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-03-16 16:31:43 UTC (rev 261920)
+++ extra-i686/PKGBUILD 2016-03-16 16:32:20 UTC (rev 261921)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kcalc
-pkgver=15.12.3
-pkgrel=1
-pkgdesc='Scientific Calculator'
-url='http://kde.org/applications/utilities/kcalc/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kinit')
-makedepends=('extra-cmake-modules' 'python' 'kdoctools')
-conflicts=('kdeutils-kcalc')
-replaces=('kdeutils-kcalc')
-groups=('kde-applications' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kcalc-${pkgver}.tar.xz")
-sha1sums=('3a702934281d8cece1efd877b344f14f51e9ce36')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../kcalc-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_TESTING=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: kcalc/repos/extra-i686/PKGBUILD (from rev 261920, kcalc/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-03-16 16:32:20 UTC (rev 261921)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kcalc
+pkgver=15.12.3
+pkgrel=2
+pkgdesc='Scientific Calculator'
+url='http://kde.org/applications/utilities/kcalc/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kinit')
+makedepends=('extra-cmake-modules' 'python' 'kdoctools')
+conflicts=('kdeutils-kcalc')
+replaces=('kdeutils-kcalc')
+groups=('kde-applications' 'kdeutils')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kcalc-${pkgver}.tar.xz" kcalc-qt5.6.patch)
+sha1sums=('3a702934281d8cece1efd877b344f14f51e9ce36'
+ 'd22bc7c30802cf7d7bec8d9da9049679ad5b754c')
+
+prepare() {
+ mkdir -p build
+
+# Workaround for null size window with Qt 5.6 (Fedora) https://bugs.kde.org/show_bug.cgi?id=360105
+ cd $pkgname-$pkgver
+ patch -p1 -i ../kcalc-qt5.6.patch
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_TESTING=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: kcalc/repos/extra-i686/kcalc-qt5.6.patch (from rev 261920, kcalc/trunk/kcalc-qt5.6.patch)
===================================================================
--- extra-i686/kcalc-qt5.6.patch (rev 0)
+++ extra-i686/kcalc-qt5.6.patch 2016-03-16 16:32:20 UTC (rev 261921)
@@ -0,0 +1,11 @@
+--- kcalc-15.12.3/kcalc.cpp.orig 2016-03-16 16:26:37.327157522 +0000
++++ kcalc-15.12.3/kcalc.cpp 2016-03-16 16:28:08.533357025 +0000
+@@ -123,7 +123,7 @@
+
+ updateGeometry();
+
+- setFixedSize(minimumSize());
++ if ( ! minimumSize().isEmpty() ) setFixedSize(minimumSize());
+
+ updateDisplay(UPDATE_FROM_CORE);
+
Deleted: extra-i686/kcalc.install
===================================================================
--- extra-i686/kcalc.install 2016-03-16 16:31:43 UTC (rev 261920)
+++ extra-i686/kcalc.install 2016-03-16 16:32:20 UTC (rev 261921)
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
Copied: kcalc/repos/extra-i686/kcalc.install (from rev 261920, kcalc/trunk/kcalc.install)
===================================================================
--- extra-i686/kcalc.install (rev 0)
+++ extra-i686/kcalc.install 2016-03-16 16:32:20 UTC (rev 261921)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-03-16 16:31:43 UTC (rev 261920)
+++ extra-x86_64/PKGBUILD 2016-03-16 16:32:20 UTC (rev 261921)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kcalc
-pkgver=15.12.3
-pkgrel=1
-pkgdesc='Scientific Calculator'
-url='http://kde.org/applications/utilities/kcalc/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kinit')
-makedepends=('extra-cmake-modules' 'python' 'kdoctools')
-conflicts=('kdeutils-kcalc')
-replaces=('kdeutils-kcalc')
-groups=('kde-applications' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kcalc-${pkgver}.tar.xz")
-sha1sums=('3a702934281d8cece1efd877b344f14f51e9ce36')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../kcalc-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_TESTING=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: kcalc/repos/extra-x86_64/PKGBUILD (from rev 261920, kcalc/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-03-16 16:32:20 UTC (rev 261921)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kcalc
+pkgver=15.12.3
+pkgrel=2
+pkgdesc='Scientific Calculator'
+url='http://kde.org/applications/utilities/kcalc/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kinit')
+makedepends=('extra-cmake-modules' 'python' 'kdoctools')
+conflicts=('kdeutils-kcalc')
+replaces=('kdeutils-kcalc')
+groups=('kde-applications' 'kdeutils')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kcalc-${pkgver}.tar.xz" kcalc-qt5.6.patch)
+sha1sums=('3a702934281d8cece1efd877b344f14f51e9ce36'
+ 'd22bc7c30802cf7d7bec8d9da9049679ad5b754c')
+
+prepare() {
+ mkdir -p build
+
+# Workaround for null size window with Qt 5.6 (Fedora) https://bugs.kde.org/show_bug.cgi?id=360105
+ cd $pkgname-$pkgver
+ patch -p1 -i ../kcalc-qt5.6.patch
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_TESTING=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: kcalc/repos/extra-x86_64/kcalc-qt5.6.patch (from rev 261920, kcalc/trunk/kcalc-qt5.6.patch)
===================================================================
--- extra-x86_64/kcalc-qt5.6.patch (rev 0)
+++ extra-x86_64/kcalc-qt5.6.patch 2016-03-16 16:32:20 UTC (rev 261921)
@@ -0,0 +1,11 @@
+--- kcalc-15.12.3/kcalc.cpp.orig 2016-03-16 16:26:37.327157522 +0000
++++ kcalc-15.12.3/kcalc.cpp 2016-03-16 16:28:08.533357025 +0000
+@@ -123,7 +123,7 @@
+
+ updateGeometry();
+
+- setFixedSize(minimumSize());
++ if ( ! minimumSize().isEmpty() ) setFixedSize(minimumSize());
+
+ updateDisplay(UPDATE_FROM_CORE);
+
Deleted: extra-x86_64/kcalc.install
===================================================================
--- extra-x86_64/kcalc.install 2016-03-16 16:31:43 UTC (rev 261920)
+++ extra-x86_64/kcalc.install 2016-03-16 16:32:20 UTC (rev 261921)
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
Copied: kcalc/repos/extra-x86_64/kcalc.install (from rev 261920, kcalc/trunk/kcalc.install)
===================================================================
--- extra-x86_64/kcalc.install (rev 0)
+++ extra-x86_64/kcalc.install 2016-03-16 16:32:20 UTC (rev 261921)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
More information about the arch-commits
mailing list