diff options
author | Jiří Klimeš | 2019-06-14 13:20:02 +0200 |
---|---|---|
committer | Jiří Klimeš | 2019-06-14 14:07:52 +0200 |
commit | 6de6a1f59b8ec15146a8579be69018f3aca02618 (patch) | |
tree | 3b593dcbd17128dd38f304a5d3cf6b06030e2473 | |
parent | a55fa7a046afcd06c30c19f13493f01e5051f1f1 (diff) | |
download | aur-6de6a1f59b8ec15146a8579be69018f3aca02618.tar.gz |
Update to upstream version 3.27
and remove the temporary building patch
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 14 | ||||
-rw-r--r-- | tecmake-fix-Linux5-build.patch | 76 |
3 files changed, 10 insertions, 94 deletions
@@ -1,7 +1,7 @@ pkgbase = iup pkgdesc = C cross platform GUI toolkit - pkgver = 3.26 - pkgrel = 2 + pkgver = 3.27 + pkgrel = 1 url = https://www.tecgraf.puc-rio.br/iup/ arch = x86_64 license = MIT @@ -17,12 +17,10 @@ pkgbase = iup makedepends = lua-cd makedepends = lua51-cd makedepends = lua52-cd - source = https://downloads.sourceforge.net/project/iup/3.26/Docs%20and%20Sources/iup-3.26_Sources.tar.gz - source = https://downloads.sourceforge.net/project/iup/3.26/Docs%20and%20Sources/iup-3.26_Docs.pdf - source = tecmake-fix-Linux5-build.patch - md5sums = 446668073d9a87c57f4e5d682b8663f4 - md5sums = 78341ce38463a168a2a14f59c58808f5 - md5sums = 057b075a25ff818e8f928a85a739398c + source = https://downloads.sourceforge.net/project/iup/3.27/Docs%20and%20Sources/iup-3.27_Sources.tar.gz + source = https://downloads.sourceforge.net/project/iup/3.27/Docs%20and%20Sources/iup-3.27_Docs.pdf + md5sums = 9593adf226daef7befd3768bc4741156 + md5sums = 9fc7af8b68256a020b858ccaec4ea8f5 pkgname = iup pkgdesc = C cross platform GUI toolkit @@ -6,8 +6,8 @@ pkgbase=iup pkgname=('iup' 'lua-iup' 'lua51-iup' 'lua52-iup') -pkgver=3.26 -pkgrel=2 +pkgver=3.27 +pkgrel=1 pkgdesc="C cross platform GUI toolkit" arch=('x86_64') url="https://www.tecgraf.puc-rio.br/iup/" @@ -28,12 +28,10 @@ makedepends=('lsb-release' source=( "https://downloads.sourceforge.net/project/iup/${pkgver}/Docs%20and%20Sources/iup-${pkgver}_Sources.tar.gz" "https://downloads.sourceforge.net/project/iup/${pkgver}/Docs%20and%20Sources/iup-${pkgver}_Docs.pdf" - "tecmake-fix-Linux5-build.patch" ) -md5sums=('446668073d9a87c57f4e5d682b8663f4' - '78341ce38463a168a2a14f59c58808f5' - '057b075a25ff818e8f928a85a739398c') +md5sums=('9593adf226daef7befd3768bc4741156' + '9fc7af8b68256a020b858ccaec4ea8f5') prepare() { # Link iupview statically @@ -46,10 +44,6 @@ prepare() { # Add RUN_PATH variable to be able to set DT_RUNPATH sed 's/$(ECHO)$(LINKER)/& $(RUN_PATH)/' -i "$srcdir"/iup/tecmake.mak sed 's/$(ECHO)$(LD)/& $(RUN_PATH)/' -i "$srcdir"/iup/tecmake.mak - - # patch for building for kernel 5.x - # temporary - until it is fixed in upstream - patch -p0 < "$srcdir"/tecmake-fix-Linux5-build.patch } _lua_iup_build_helper() { diff --git a/tecmake-fix-Linux5-build.patch b/tecmake-fix-Linux5-build.patch deleted file mode 100644 index d15dd02dd381..000000000000 --- a/tecmake-fix-Linux5-build.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- iup/tecmake.mak 2019-06-14 12:29:33.336492042 +0200 -+++ iup/tecmake.mak.new 2019-06-14 12:27:56.818718486 +0200 -@@ -299,12 +299,12 @@ - - ifdef GTK_DEFAULT - ifndef USE_GTK2 -- ifneq ($(findstring Linux4, $(TEC_UNAME)), ) -- USE_GTK3 = Yes -- endif -- ifneq ($(findstring Linux31, $(TEC_UNAME)), ) -- USE_GTK3 = Yes -+ ifneq ($(findstring Linux, $(TEC_UNAME)), ) -+ ifeq ($(shell expr $(TEC_SYSVERSION)$(TEC_SYSMINOR) \>= 31), 1) -+ USE_GTK3 = Yes -+ endif - endif -+ - ifneq ($(findstring cygw, $(TEC_UNAME)), ) - USE_GTK3 = Yes - endif -@@ -1169,15 +1169,16 @@ - LDIR += $(CD_LIB) - endif - -- ifneq ($(findstring Linux26g4, $(TEC_UNAME)), ) -- LIBS += fontconfig -- endif -- ifneq ($(findstring Linux3, $(TEC_UNAME)), ) -- LIBS += fontconfig -- endif -- ifneq ($(findstring Linux4, $(TEC_UNAME)), ) -- LIBS += fontconfig -+ ifneq ($(findstring Linux, $(TEC_UNAME)), ) -+ ifeq ($(shell expr $(TEC_SYSVERSION) \>= 3), 1) -+ LIBS += fontconfig -+ else -+ ifneq ($(findstring Linux26g4, $(TEC_UNAME)), ) -+ LIBS += fontconfig -+ endif -+ endif - endif -+ - ifneq ($(findstring cygw, $(TEC_UNAME)), ) - LIBS += fontconfig - endif -@@ -1213,18 +1214,20 @@ - endif - - ifdef LINK_WEBKIT -- ifneq ($(findstring Linux4, $(TEC_UNAME)), ) -- LIBS += webkitgtk-3.0 -- else -- ifneq ($(findstring Linux3, $(TEC_UNAME)), ) -- ifdef USE_GTK3 -- LIBS += webkitgtk-3.0 -- else -- LIBS += webkitgtk-1.0 -+ ifneq ($(findstring Linux, $(TEC_UNAME)), ) -+ ifeq ($(shell expr $(TEC_SYSVERSION) \>= 4), 1) -+ LIBS += webkitgtk-3.0 -+ else -+ ifneq ($(findstring Linux3, $(TEC_UNAME)), ) -+ ifdef USE_GTK3 -+ LIBS += webkitgtk-3.0 -+ else -+ LIBS += webkitgtk-1.0 -+ endif - endif -- else -- LIBS += webkit-1.0 - endif -+ else -+ LIBS += webkit-1.0 - endif - endif - |