summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilken 'Akiko' Gottwalt2016-08-18 11:36:02 +0200
committerWilken 'Akiko' Gottwalt2016-08-18 11:36:02 +0200
commitd2b7ade67d056efd703bbe77d058f11d67457992 (patch)
treefa3a614b9813b6e53bfdd6997b539b7f3068333f
parent65606c6d6b08cc98aed6ef7a909ed32cb38918ce (diff)
downloadaur-d2b7ade67d056efd703bbe77d058f11d67457992.tar.gz
Just a version bump (1.3 -> 1.4).
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD9
-rw-r--r--fix_cmake_alsa.patch22
3 files changed, 7 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2585a8d80c31..11052966b437 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = nana
pkgdesc = An opensource cross-platform GUI library written in modern C++11 for static linking
- pkgver = 1.3.0
- pkgrel = 2
+ pkgver = 1.4.0
+ pkgrel = 1
url = http://nanapro.org/en-us/
arch = i686
arch = x86_64
@@ -18,11 +18,9 @@ pkgbase = nana
depends = libpng
depends = libx11
depends = libxft
- source = http://downloads.sourceforge.net/project/nanapro/Nana/Nana 1.x/nana 1.3.0.zip
- source = fix_cmake_alsa.patch
+ source = http://downloads.sourceforge.net/project/nanapro/Nana/Nana 1.x/nana 1.4.0.zip
source = fix_memcpy.patch
- sha256sums = 9d3eea56cf330e7064bb193bc53d102f34b14a3a6dc415585f011f6638ec395d
- sha256sums = c0fd8c44b51d663e5191dd859e033fbd2ec096df9f0c0b68c868e3a88b14bda4
+ sha256sums = 7af5f4922d21ccfa9157a489f7f69594d13d32792300b22141bae0f97ce91ab0
sha256sums = 98c5401396583534682c21b8b2762a1cbbcbecd997804a5b11aabe1094ac4b44
pkgname = nana
diff --git a/PKGBUILD b/PKGBUILD
index 898466bee4da..bd3e4dc12ebd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Wilken 'Akiko' Gottwalt <akiko@mailbox.org>
pkgname=nana
-pkgver=1.3.0
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
pkgdesc="An opensource cross-platform GUI library written in modern C++11 for static linking"
arch=("i686" "x86_64")
url="http://nanapro.org/en-us/"
@@ -10,16 +10,13 @@ license=("custom:Boost Software License")
depends=("alsa-lib" "libjpeg-turbo" "libpng" "libx11" "libxft")
makedepends=("alsa-lib" "cmake" "libjpeg-turbo" "libpng" "libx11" "libxft" "xproto")
source=("http://downloads.sourceforge.net/project/nanapro/Nana/Nana 1.x/${pkgname} ${pkgver}.zip"
- fix_cmake_alsa.patch
fix_memcpy.patch)
-sha256sums=('9d3eea56cf330e7064bb193bc53d102f34b14a3a6dc415585f011f6638ec395d'
- 'c0fd8c44b51d663e5191dd859e033fbd2ec096df9f0c0b68c868e3a88b14bda4'
+sha256sums=('7af5f4922d21ccfa9157a489f7f69594d13d32792300b22141bae0f97ce91ab0'
'98c5401396583534682c21b8b2762a1cbbcbecd997804a5b11aabe1094ac4b44')
prepare() {
cd ${srcdir}/${pkgname}
- patch -Np1 < ../fix_cmake_alsa.patch
patch -Np1 < ../fix_memcpy.patch
}
diff --git a/fix_cmake_alsa.patch b/fix_cmake_alsa.patch
deleted file mode 100644
index 807a8f470480..000000000000
--- a/fix_cmake_alsa.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urpN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2016-02-08 12:57:40.000000000 +0100
-+++ b/CMakeLists.txt 2016-07-10 12:28:14.355518026 +0200
-@@ -108,12 +108,12 @@ endif(ENABLE_JPEG)
- if(ENABLE_AUDIO)
- add_definitions(-DNANA_ENABLE_AUDIO)
- if(UNIX)
-- find_package(asound)
-- if (ASOUND_FOUND)
-- include_directories( ${ASOUND_INCLUDE_DIRS})
-- else(ASOUND_FOUND)
-- message(FATAL_ERROR "libasound is not found")
-- endif(ASOUND_FOUND)
-+ find_package(ALSA)
-+ if (ALSA_FOUND)
-+ include_directories( ${ALSA_INCLUDE_DIRS})
-+ else(ALSA_FOUND)
-+ message(FATAL_ERROR "ALSA is not found")
-+ endif(ALSA_FOUND)
- endif(UNIX)
- endif(ENABLE_AUDIO)
-