[arch-commits] Commit in libkdcraw/repos (10 files)
Antonio Rojas
arojas at archlinux.org
Tue Jun 2 06:46:56 UTC 2015
Date: Tuesday, June 2, 2015 @ 08:46:54
Author: arojas
Revision: 240017
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libkdcraw/repos/extra-i686/PKGBUILD
(from rev 240016, libkdcraw/trunk/PKGBUILD)
libkdcraw/repos/extra-i686/gcc-5.patch
(from rev 240016, libkdcraw/trunk/gcc-5.patch)
libkdcraw/repos/extra-i686/libkdcraw.install
(from rev 240016, libkdcraw/trunk/libkdcraw.install)
libkdcraw/repos/extra-x86_64/PKGBUILD
(from rev 240016, libkdcraw/trunk/PKGBUILD)
libkdcraw/repos/extra-x86_64/gcc-5.patch
(from rev 240016, libkdcraw/trunk/gcc-5.patch)
libkdcraw/repos/extra-x86_64/libkdcraw.install
(from rev 240016, libkdcraw/trunk/libkdcraw.install)
Deleted:
libkdcraw/repos/extra-i686/PKGBUILD
libkdcraw/repos/extra-i686/libkdcraw.install
libkdcraw/repos/extra-x86_64/PKGBUILD
libkdcraw/repos/extra-x86_64/libkdcraw.install
--------------------------------+
/PKGBUILD | 82 +++++++++++++++++++++++++++++++++++++++
/libkdcraw.install | 22 ++++++++++
extra-i686/PKGBUILD | 36 -----------------
extra-i686/gcc-5.patch | 23 ++++++++++
extra-i686/libkdcraw.install | 11 -----
extra-x86_64/PKGBUILD | 36 -----------------
extra-x86_64/gcc-5.patch | 23 ++++++++++
extra-x86_64/libkdcraw.install | 11 -----
8 files changed, 150 insertions(+), 94 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-06-02 06:46:29 UTC (rev 240016)
+++ extra-i686/PKGBUILD 2015-06-02 06:46:54 UTC (rev 240017)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=libkdcraw
-pkgver=15.04.1
-pkgrel=1
-pkgdesc="A C++ interface used to decode RAW picture"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'libraw')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/applications/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('c93001089787ba918ce1930ca1c196101866fbe6')
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: libkdcraw/repos/extra-i686/PKGBUILD (from rev 240016, libkdcraw/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-06-02 06:46:54 UTC (rev 240017)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=libkdcraw
+pkgver=15.04.2
+pkgrel=1
+pkgdesc="A C++ interface used to decode RAW picture"
+url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs' 'libraw')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/applications/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" 'gcc-5.patch')
+sha1sums=('4f1b3ec3f831b8dd6c1d4b2c7c90a0f19e2acbc7'
+ 'fc5a24e05feab6481b61c37bfe83a0d4b2af4e09')
+
+prepare() {
+ mkdir build
+
+# Fix build with GCC 5
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir"/gcc-5.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: libkdcraw/repos/extra-i686/gcc-5.patch (from rev 240016, libkdcraw/trunk/gcc-5.patch)
===================================================================
--- extra-i686/gcc-5.patch (rev 0)
+++ extra-i686/gcc-5.patch 2015-06-02 06:46:54 UTC (rev 240017)
@@ -0,0 +1,23 @@
+From: Gilles Caulier <caulier.gilles at gmail.com>
+Date: Thu, 14 May 2015 20:54:16 +0000
+Subject: libraw 0.16.1 needs C++ exceptions rules while compilation
+X-Git-Url: http://quickgit.kde.org/?p=libkdcraw.git&a=commitdiff&h=46898ec97a0462eb08a5b6d09999450a86b27aae
+---
+libraw 0.16.1 needs C++ exceptions rules while compilation
+BUGS: 347728
+FIXED-IN: 4.11.0
+---
+
+
+--- a/libkdcraw/CMakeLists.txt
++++ b/libkdcraw/CMakeLists.txt
+@@ -3,6 +3,8 @@
+ #
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++add_definitions(${KDE4_ENABLE_EXCEPTIONS})
+
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+
+
Deleted: extra-i686/libkdcraw.install
===================================================================
--- extra-i686/libkdcraw.install 2015-06-02 06:46:29 UTC (rev 240016)
+++ extra-i686/libkdcraw.install 2015-06-02 06:46:54 UTC (rev 240017)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: libkdcraw/repos/extra-i686/libkdcraw.install (from rev 240016, libkdcraw/trunk/libkdcraw.install)
===================================================================
--- extra-i686/libkdcraw.install (rev 0)
+++ extra-i686/libkdcraw.install 2015-06-02 06:46:54 UTC (rev 240017)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-06-02 06:46:29 UTC (rev 240016)
+++ extra-x86_64/PKGBUILD 2015-06-02 06:46:54 UTC (rev 240017)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=libkdcraw
-pkgver=15.04.1
-pkgrel=1
-pkgdesc="A C++ interface used to decode RAW picture"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'libraw')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/applications/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('c93001089787ba918ce1930ca1c196101866fbe6')
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: libkdcraw/repos/extra-x86_64/PKGBUILD (from rev 240016, libkdcraw/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-06-02 06:46:54 UTC (rev 240017)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=libkdcraw
+pkgver=15.04.2
+pkgrel=1
+pkgdesc="A C++ interface used to decode RAW picture"
+url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs' 'libraw')
+makedepends=('cmake' 'automoc4')
+replaces=('kdegraphics-libs')
+conflicts=('kdegraphics-libs')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/applications/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" 'gcc-5.patch')
+sha1sums=('4f1b3ec3f831b8dd6c1d4b2c7c90a0f19e2acbc7'
+ 'fc5a24e05feab6481b61c37bfe83a0d4b2af4e09')
+
+prepare() {
+ mkdir build
+
+# Fix build with GCC 5
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir"/gcc-5.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: libkdcraw/repos/extra-x86_64/gcc-5.patch (from rev 240016, libkdcraw/trunk/gcc-5.patch)
===================================================================
--- extra-x86_64/gcc-5.patch (rev 0)
+++ extra-x86_64/gcc-5.patch 2015-06-02 06:46:54 UTC (rev 240017)
@@ -0,0 +1,23 @@
+From: Gilles Caulier <caulier.gilles at gmail.com>
+Date: Thu, 14 May 2015 20:54:16 +0000
+Subject: libraw 0.16.1 needs C++ exceptions rules while compilation
+X-Git-Url: http://quickgit.kde.org/?p=libkdcraw.git&a=commitdiff&h=46898ec97a0462eb08a5b6d09999450a86b27aae
+---
+libraw 0.16.1 needs C++ exceptions rules while compilation
+BUGS: 347728
+FIXED-IN: 4.11.0
+---
+
+
+--- a/libkdcraw/CMakeLists.txt
++++ b/libkdcraw/CMakeLists.txt
+@@ -3,6 +3,8 @@
+ #
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++add_definitions(${KDE4_ENABLE_EXCEPTIONS})
+
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+
+
Deleted: extra-x86_64/libkdcraw.install
===================================================================
--- extra-x86_64/libkdcraw.install 2015-06-02 06:46:29 UTC (rev 240016)
+++ extra-x86_64/libkdcraw.install 2015-06-02 06:46:54 UTC (rev 240017)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: libkdcraw/repos/extra-x86_64/libkdcraw.install (from rev 240016, libkdcraw/trunk/libkdcraw.install)
===================================================================
--- extra-x86_64/libkdcraw.install (rev 0)
+++ extra-x86_64/libkdcraw.install 2015-06-02 06:46:54 UTC (rev 240017)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list