diff --git a/amarok/PKGBUILD b/amarok/PKGBUILD index 3fb4c5dbb..bb671b72a 100644 --- a/amarok/PKGBUILD +++ b/amarok/PKGBUILD @@ -1,6 +1,6 @@ pkgname=amarok pkgver=2.9.0 -pkgrel=2 +pkgrel=3 pkgdesc="A media player for KDE" arch=('x86_64') url="https://amarok.kde.org" @@ -15,7 +15,6 @@ optdepends=("libgpod: support Apple iPod audio devices" "clamz: allow to download songs from Amazon.com" "loudmouth: backend needed by mp3tunes for syncing") categories=('multimedia') -install="${pkgname}.install" source=("https://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") sha256sums=('e3678de79db36956bc8588b9905726ace1b9188e7fdf89eaea265f1cb03116fd') @@ -29,7 +28,8 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DKDE4_BUILD_TESTS=OFF \ -DWITH_NepomukCore=OFF \ - -DWITH_Soprano=OFF + -DWITH_Soprano=OFF \ + -DWITH_QTWEBKIT=OFF make } @@ -37,5 +37,3 @@ package(){ cd "${srcdir}/${pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install } - - diff --git a/amarok/amarok.install b/amarok/amarok.install deleted file mode 100644 index e70c054ec..000000000 --- a/amarok/amarok.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/android-file-transfer-linux/PKGBUILD b/android-file-transfer-linux/PKGBUILD index 0bed943df..d70eb30a7 100644 --- a/android-file-transfer-linux/PKGBUILD +++ b/android-file-transfer-linux/PKGBUILD @@ -1,13 +1,12 @@ pkgname=android-file-transfer-linux pkgver=3.3 -pkgrel=1 +pkgrel=2 pkgdesc="An interactive MTP client implemented in C++ using Qt toolkit" arch=('x86_64') url="https://github.com/whoozle/android-file-transfer-linux" license=('LGPL') depends=('qt5-base' 'fuse' 'hicolor-icon-theme' 'libxkbcommon-x11' 'file') makedepends=('cmake') -install=$pkgname.install source=("https://github.com/whoozle/android-file-transfer-linux/archive/v$pkgver.tar.gz" "solid_aftl.desktop" fix_build1.patch::https://github.com/whoozle/android-file-transfer-linux/commit/8980ff8171961134334d388b5a0ed54e0186b31f.patch diff --git a/android-file-transfer-linux/android-file-transfer-linux.install b/android-file-transfer-linux/android-file-transfer-linux.install deleted file mode 100644 index e3e268c2d..000000000 --- a/android-file-transfer-linux/android-file-transfer-linux.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - diff --git a/arora/PKGBUILD b/arora/PKGBUILD deleted file mode 100644 index b4b0224b6..000000000 --- a/arora/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# -# Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa -# contributor (x86_64): Giuseppe Calà - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname=arora -pkgver=0.11.0 -pkgrel=2 -pkgdesc='A cross platform web browser built using Qt and WebKit' -url='http://www.arora-browser.org' -license=('GPL') -arch=('i686' 'x86_64') -depends=('qt' 'openssl' 'xdg-utils') -categories=('network') -install='arora.install' -source=("http://arora.googlecode.com/files/arora-${pkgver}.tar.gz") -md5sums=('64334ce4198861471cad9316d841f0cb') - -build() { - cd $srcdir/$pkgname-$pkgver - qmake PREFIX="/usr" "CONFIG-=debug" -r - make - make INSTALL_ROOT=$pkgdir install -} diff --git a/arora/arora.install b/arora/arora.install deleted file mode 100644 index e70c054ec..000000000 --- a/arora/arora.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/assaultcube/PKGBUILD b/assaultcube/PKGBUILD index 934a5d8aa..2427d8fce 100644 --- a/assaultcube/PKGBUILD +++ b/assaultcube/PKGBUILD @@ -6,26 +6,33 @@ pkgname=assaultcube _pkgname=AssaultCube pkgver=1.2.0.2 -pkgrel=1 +pkgrel=2 pkgdesc='A realistic team oriented multiplayer FPS based on the Cube engine' arch=('x86_64') url='http://assault.cubers.net/' license=('ZLIB' 'custom') depends=('sdl' 'sdl_mixer' 'sdl_image' 'openal' 'zlib' 'gcc-libs' 'libgl' 'desktop-file-utils' 'glu') makedepends=('mesa' 'clang') -install=${pkgname}.install source=("http://downloads.sourceforge.net/project/actiongame/${_pkgname}%20Version%20${pkgver}/${_pkgname}_v${pkgver}.tar.bz2" "http://downloads.sourceforge.net/project/actiongame/${_pkgname}%20Version%20${pkgver}/${_pkgname}_v${pkgver}.source.tar.bz2" 'assaultcube' 'assaultcube-server' 'assaultcube.desktop' - 'assaultcube.png') + 'assaultcube.png' + assaultcube-gcc6.patch) sha256sums=('77ac41bdf07f6d74367e29089c2ee34da5ef53fdf979d7dfad58c3edce5f0717' '949321c7ae82b740b746ee815b468fd732f633819c176334f5c62e916ed9ca03' '8ad5a849c14b362f7d879708d95840b5ce8dd41c39ac39770ef3cdba2ebd684f' '66b1a4a2d3c69218d152017ecfadfd1d4e78e691393c8896763eeee089f7f4cc' 'bf506f63bb46c040fda94c85a2f03a7146de9c635957aaaa9891f65db5bb629c' - '0b6b529e3f9c7973942ef91c6bef82181631651564d3613de983a12f1083c457') + '0b6b529e3f9c7973942ef91c6bef82181631651564d3613de983a12f1083c457' + '5d2815a3426cdf46fff12de4ae6bee8b26eb367f83b842ecd2f6afa3186c3e26') + +prepare() { + cd AssaultCube_v${pkgver}.source + # Fix build with GCC 6 + patch -p1 -i ../assaultcube-gcc6.patch +} build() { cd ${_pkgname}_v${pkgver}.source/source/src diff --git a/assaultcube/assaultcube-gcc6.patch b/assaultcube/assaultcube-gcc6.patch new file mode 100644 index 000000000..521372ee9 --- /dev/null +++ b/assaultcube/assaultcube-gcc6.patch @@ -0,0 +1,301 @@ +From 752950989b4e286459ca9aee3d61a868d7b20fa4 Mon Sep 17 00:00:00 2001 +From: ac-stef +Date: Sat, 27 Feb 2016 21:28:23 +0100 +Subject: [PATCH] fix some errors and warnings for GCC 6 + +* do not use std::abs() because math.h includes one, that converts ints + to double. Use own iabs(), which directly uses labs() instead. +* don't use the word "gamma" as name for variables +* don't use a homebrew round() function +--- + source/src/bot/bot_waypoint.cpp | 12 ++++++------ + source/src/command.cpp | 2 +- + source/src/command.h | 1 + + source/src/crypto.cpp | 2 +- + source/src/editing.cpp | 6 +++--- + source/src/entity.h | 2 +- + source/src/main.cpp | 8 ++++---- + source/src/platform.h | 9 +-------- + source/src/protos.h | 3 ++- + source/src/rendercubes.cpp | 8 ++++---- + source/src/rendertext.cpp | 4 ++-- + source/src/tools.h | 3 +-- + source/src/world.cpp | 6 +++--- + source/src/worldocull.cpp | 2 +- + source/src/worldrender.cpp | 4 ++-- + 15 files changed, 33 insertions(+), 39 deletions(-) + +diff --git a/source/src/bot/bot_waypoint.cpp b/source/src/bot/bot_waypoint.cpp +index 520c686..7b265ef 100644 +--- a/source/src/bot/bot_waypoint.cpp ++++ b/source/src/bot/bot_waypoint.cpp +@@ -1221,7 +1221,7 @@ void CWaypointClass::CalcCost(node_s *pNode) + flCost += (1.0f-flFraction)*0.5f; + } + +- if ((abs(a) > 4) || (abs(b) > 4)) continue; ++ if ((iabs(a) > 4) || (iabs(b) > 4)) continue; + + vec from = to; + to.z -= (JUMP_HEIGHT - 1.0f); +@@ -1249,7 +1249,7 @@ void CWaypointClass::CalcCost(node_s *pNode) + flCost += (1.0f-flFraction)*0.5f; + } + +- if ((abs(a) > 4) || (abs(b) > 4)) continue; ++ if ((iabs(a) > 4) || (iabs(b) > 4)) continue; + + vec from = to; + to.z -= (JUMP_HEIGHT - 1.0f); +@@ -1671,12 +1671,12 @@ node_s *CWaypointClass::GetNearestTriggerFloodWP(vec v_origin, float flRange) + void CWaypointClass::GetNodeIndexes(const vec &v_origin, short *i, short *j) + { + // Function code by cheesy and PMB +- //*i = abs((int)((int)(v_origin.x + (2*ssize)) / SECTOR_SIZE)); +- //*j = abs((int)((int)(v_origin.y + (2*ssize)) / SECTOR_SIZE)); ++ //*i = iabs((int)((int)(v_origin.x + (2*ssize)) / SECTOR_SIZE)); ++ //*j = iabs((int)((int)(v_origin.y + (2*ssize)) / SECTOR_SIZE)); + //*i = (int)((v_origin.x) / ssize * MAX_MAP_GRIDS); + //*j = (int)((v_origin.y) / ssize * MAX_MAP_GRIDS); +- *i = abs((int)((v_origin.x) / MAX_MAP_GRIDS)); +- *j = abs((int)((v_origin.y) / MAX_MAP_GRIDS)); ++ *i = iabs((int)((v_origin.x) / MAX_MAP_GRIDS)); ++ *j = iabs((int)((v_origin.y) / MAX_MAP_GRIDS)); + + if (*i > MAX_MAP_GRIDS - 1) + *i = MAX_MAP_GRIDS - 1; +diff --git a/source/src/command.cpp b/source/src/command.cpp +index 668f3bf..2a5c90d 100644 +--- a/source/src/command.cpp ++++ b/source/src/command.cpp +@@ -499,7 +499,7 @@ char *executeret(const char *p) // all evaluation hap + if(lc<=seer_t1.length()) + { + int dt = seer_t1[seer_index] - seer_t1[lc]; +- if(abs(dt)<2) ++ if(iabs(dt)<2) + { + conoutf("SCRIPT EXECUTION warning [%d:%s]", &p, p); + seer_t2.add(seer_t1[seer_index]); +diff --git a/source/src/command.h b/source/src/command.h +index a3ca68a..2a3de0c 100644 +--- a/source/src/command.h ++++ b/source/src/command.h +@@ -86,6 +86,7 @@ enum { IEXC_CORE = 0, IEXC_CFG, IEXC_PROMPT, IEXC_MAPCFG, IEXC_MDLCFG, IEXC_NUM + #define VARNP(name, global, min, cur, max) int global = variable(#name, min, cur, max, &global, NULL, true) + #define VARF(name, min, cur, max, body) extern int name; void var_##name() { body; } int name = variable(#name, min, cur, max, &name, var_##name, false) + #define VARFP(name, min, cur, max, body) extern int name; void var_##name() { body; } int name = variable(#name, min, cur, max, &name, var_##name, true) ++#define VARNFP(name, global, min, cur, max, body) extern int global; void var_##name() { body; } int global = variable(#name, min, cur, max, &global, var_##name, true) + + #define FVARP(name, min, cur, max) float name = fvariable(#name, min, cur, max, &name, NULL, true) + #define FVAR(name, min, cur, max) float name = fvariable(#name, min, cur, max, &name, NULL, false) +diff --git a/source/src/crypto.cpp b/source/src/crypto.cpp +index 44041be..0684750 100644 +--- a/source/src/crypto.cpp ++++ b/source/src/crypto.cpp +@@ -778,7 +778,7 @@ static const char *hashchunktoa(tiger::chunk h) // portable solution instead o + const char *genpwdhash(const char *name, const char *pwd, int salt) + { + static string temp; +- formatstring(temp)("%s %d %s %s %d", pwd, salt, name, pwd, abs(PROTOCOL_VERSION)); ++ formatstring(temp)("%s %d %s %s %d", pwd, salt, name, pwd, iabs(PROTOCOL_VERSION)); + tiger::hashval hash; + tiger::hash((uchar *)temp, (int)strlen(temp), hash); + formatstring(temp)("%s %s %s", hashchunktoa(hash.chunks[0]), hashchunktoa(hash.chunks[1]), hashchunktoa(hash.chunks[2])); +diff --git a/source/src/editing.cpp b/source/src/editing.cpp +index 8d5e1ff..745aa98 100644 +--- a/source/src/editing.cpp ++++ b/source/src/editing.cpp +@@ -137,11 +137,11 @@ void checkselections() + void makesel(bool isnew) + { + block &cursel = sels.last(); //RR 10/12/12 - FIXEME, error checking should happen with "isnew", not here checking if it really is new. +- if(isnew || sels.length() == 0) addselection(min(lastx, cx), min(lasty, cy), abs(lastx-cx)+1, abs(lasty-cy)+1, max(lasth, ch)); ++ if(isnew || sels.length() == 0) addselection(min(lastx, cx), min(lasty, cy), iabs(lastx-cx)+1, iabs(lasty-cy)+1, max(lasth, ch)); + else + { + cursel.x = min(lastx, cx); cursel.y = min(lasty, cy); +- cursel.xs = abs(lastx-cx)+1; cursel.ys = abs(lasty-cy)+1; ++ cursel.xs = iabs(lastx-cx)+1; cursel.ys = iabs(lasty-cy)+1; + cursel.h = max(lasth, ch); + correctsel(cursel); + } +@@ -849,7 +849,7 @@ void movemap(int xo, int yo, int zo) // move whole map + } + if(xo || yo) + { +- block b = { max(-xo, 0), max(-yo, 0), ssize - abs(xo), ssize - abs(yo) }, *cp = blockcopy(b); ++ block b = { max(-xo, 0), max(-yo, 0), ssize - iabs(xo), ssize - iabs(yo) }, *cp = blockcopy(b); + cp->x = max(xo, 0); + cp->y = max(yo, 0); + blockpaste(*cp); +diff --git a/source/src/entity.h b/source/src/entity.h +index e2ad32d..84ac385 100644 +--- a/source/src/entity.h ++++ b/source/src/entity.h +@@ -538,7 +538,7 @@ class playerent : public dynent, public playerstate + { + const int maxskin[2] = { 4, 6 }; + t = team_base(t < 0 ? team : t); +- nextskin[t] = abs(s) % maxskin[t]; ++ nextskin[t] = iabs(s) % maxskin[t]; + } + }; + +diff --git a/source/src/main.cpp b/source/src/main.cpp +index 0d57c0c..c51cd74 100644 +--- a/source/src/main.cpp ++++ b/source/src/main.cpp +@@ -519,11 +519,11 @@ void setresdata(char *s, enet_uint32 c) + COMMANDF(screenres, "ii", (int *w, int *h) { screenres(*w, *h); }); + + static int curgamma = 100; +-VARFP(gamma, 30, 100, 300, ++VARNFP(gamma, vgamma, 30, 100, 300, + { +- if(gamma == curgamma) return; +- curgamma = gamma; +- float f = gamma/100.0f; ++ if(vgamma == curgamma) return; ++ curgamma = vgamma; ++ float f = vgamma/100.0f; + if(SDL_SetGamma(f,f,f)==-1) conoutf("Could not set gamma: %s", SDL_GetError()); + }); + +diff --git a/source/src/platform.h b/source/src/platform.h +index aece7e2..fd2eef1 100644 +--- a/source/src/platform.h ++++ b/source/src/platform.h +@@ -2,14 +2,6 @@ + #ifdef _FORTIFY_SOURCE + #undef _FORTIFY_SOURCE + #endif +- +- #define gamma __gamma +-#endif +- +-#include +- +-#ifdef __GNUC__ +- #undef gamma + #endif + + #include +@@ -19,6 +11,7 @@ + #include + #include + #include ++#include + #ifdef __GNUC__ + #include + #include +diff --git a/source/src/protos.h b/source/src/protos.h +index 1c07fad..97b0ee0 100644 +--- a/source/src/protos.h ++++ b/source/src/protos.h +@@ -1053,7 +1053,8 @@ struct servercommandline + { + demo_interm = true; + } +- else if(ai > 0) maxdemos = ai; break; ++ else if(ai > 0) maxdemos = ai; ++ break; + } + case 'W': demopath = a; break; + case 'r': maprot = a; break; +diff --git a/source/src/rendercubes.cpp b/source/src/rendercubes.cpp +index 1940da8..2be7fb0 100644 +--- a/source/src/rendercubes.cpp ++++ b/source/src/rendercubes.cpp +@@ -216,9 +216,9 @@ void render_flat(int wtex, int x, int y, int size, int h, sqr *l1, sqr *l4, sqr + else // continue strip + { + int lighterr = lighterror*2; +- if((abs(ol1r-l3->r)r)g)g)b)b)r)r)g)g)b)b)r)g)b)r)g)b) 0) ? --sp : sp]; // restore color + else if(c == 'b') { if(allowblinkingtext && !ignoreblinkingbit) stack[sp] *= -1; } // blinking text - only if allowed + else stack[sp] = c; +- switch(abs(stack[sp])) ++ switch(iabs(stack[sp])) + { + case '0': color = bvec( 2, 255, 128 ); break; // green: player talk + case '1': color = bvec( 96, 160, 255 ); break; // blue: team chat +@@ -380,7 +380,7 @@ static void text_color(char c, char *stack, int size, int &sp, bvec color, int a + //default: color = bvec( 255, 255, 255 ); break; + } + int b = (int) (sinf(lastmillis / 200.0f) * 115.0f); +- b = stack[sp] > 0 ? 100 : min(abs(b), 100); ++ b = stack[sp] > 0 ? 100 : min(iabs(b), 100); + glColor4ub(color.x, color.y, color.z, (a * b) / 100); + } + } +diff --git a/source/src/tools.h b/source/src/tools.h +index 0aeacff..9eb5a38 100644 +--- a/source/src/tools.h ++++ b/source/src/tools.h +@@ -54,8 +54,7 @@ static inline T min(T a, T b) + { + return a < b ? a : b; + } +- +-static inline float round(float x) { return floor(x + 0.5f); } ++inline int iabs(int n) { return labs(n); } + + #define clamp(a,b,c) (max(b, min(a, c))) + #define rnd(x) ((int)(randomMT()&0xFFFFFF)%(x)) +diff --git a/source/src/world.cpp b/source/src/world.cpp +index 6a1c7bb..99a70eb 100644 +--- a/source/src/world.cpp ++++ b/source/src/world.cpp +@@ -79,9 +79,9 @@ void remip(const block &b, int level) + || o[i]->ceil!=o[3]->ceil + || o[i]->ftex!=o[3]->ftex + || o[i]->ctex!=o[3]->ctex +- || abs(o[i+1]->r-o[0]->r)>lighterr // perfect mip even if light is not exactly equal +- || abs(o[i+1]->g-o[0]->g)>lighterr +- || abs(o[i+1]->b-o[0]->b)>lighterr ++ || iabs(o[i+1]->r-o[0]->r)>lighterr // perfect mip even if light is not exactly equal ++ || iabs(o[i+1]->g-o[0]->g)>lighterr ++ || iabs(o[i+1]->b-o[0]->b)>lighterr + || o[i]->utex!=o[3]->utex + || o[i]->wtex!=o[3]->wtex) goto c; + } +diff --git a/source/src/worldrender.cpp b/source/src/worldrender.cpp +index 8fd3104..45aa606 100644 +--- a/source/src/worldrender.cpp ++++ b/source/src/worldrender.cpp +@@ -297,10 +297,10 @@ void distlod(int &low, int &high, int angle, float widef) + void render_world(float vx, float vy, float vh, float changelod, int yaw, int pitch, float fov, float fovy, int w, int h) + { + loopi(LARGEST_FACTOR) stats[i] = 0; +- min_lod = minimap || (player1->isspectating() && player1->spectatemode == SM_OVERVIEW) ? MAX_LOD : MIN_LOD+abs(pitch)/12; ++ min_lod = minimap || (player1->isspectating() && player1->spectatemode == SM_OVERVIEW) ? MAX_LOD : MIN_LOD+iabs(pitch)/12; + yaw = 360-yaw; + float widef = fov/75.0f; +- int cdist = abs(yaw%90-45); ++ int cdist = iabs(yaw%90-45); + if(cdist<7) // hack to avoid popup at high fovs at 45 yaw + { + min_lod = max(min_lod, (int)(MIN_LOD+(10-cdist)/1.0f*widef)); // less if lod worked better diff --git a/assaultcube/assaultcube.install b/assaultcube/assaultcube.install deleted file mode 100644 index 724bfce00..000000000 --- a/assaultcube/assaultcube.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/bibletime-kde4/PKGBUILD b/bibletime-kde4/PKGBUILD deleted file mode 100755 index ca4ec603e..000000000 --- a/bibletime-kde4/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -pkgname=bibletime-kde4 -origname=bibletime -pkgver=2.10.1 -pkgrel=1 -pkgdesc="Bible software that uses the Sword Engine for KDE4" -arch=('x86_64') -url="http://www.blog.bibletime.info" -license=('GPL2') -depends=('qtwebkit' 'sword' 'openssl' 'clucene') -makedepends=('cmake') -categories=('education') -source=(http://sourceforge.net/projects/bibletime/files/bibletime-$pkgver.tar.xz) -md5sums=('ef4d189d53fd1608c56f4827947ffcf0') - -build() { - mkdir "$srcdir/$origname-$pkgver/build_dir" - cd "$srcdir/$origname-$pkgver/build_dir" - - CXXFLAGS+=" -fpermissive" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DBT_FORCE_USE_QT4=TRUE \ - .. - - make -} - -package() { - cd "$srcdir/$origname-$pkgver/build_dir" - make DESTDIR="$pkgdir" install -} - diff --git a/bibletime/PKGBUILD b/bibletime/PKGBUILD new file mode 100755 index 000000000..f21517dd5 --- /dev/null +++ b/bibletime/PKGBUILD @@ -0,0 +1,36 @@ +pkgname=bibletime +pkgver=2.11.1 +pkgrel=1 +pkgdesc="Bible software that uses the Sword Engine for KDE4" +arch=('x86_64') +url='http://www.bibletime.info/' +license=('GPL2') +depends=('sword' 'clucene' 'qt5-webengine' 'qt5-svg') +makedepends=('cmake' 'qt5-tools') +replaces=('bibletime-kde4') +provides=('bibletime-kde4') +conflicts=('bibletime-kde4') +source=("$pkgname-$pkgver.tar.gz::https://github.com/bibletime/bibletime/archive/v$pkgver.tar.gz" + qt5.11.patch) +sha512sums=('ad718b2c7b6591991ffdcd00fdb9a2bcd7905bc5b8c8cf9828ce60e3a3b1ecbafb6fa06ac5689a1e8e33590439d8bc4cf69f0584bec30c3adb3c32cc14006342' + 'cbe076660075e2227fcc4abd26267cc2e47aa9929cb207ff9dddfefa78e8f822fda4f2389474920a6c1db10441a8775bf25bf320954bcceba20f9091a3324a69') + +prepare() { + mkdir -p build + + cd bibletime-$pkgver + patch -p1 -i ../qt5.11.patch +} + +build() { + cd build + + cmake ../bibletime-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + make -C build DESTDIR="$pkgdir" install +} diff --git a/bibletime/qt5.11.patch b/bibletime/qt5.11.patch new file mode 100644 index 000000000..3ab07b5b8 --- /dev/null +++ b/bibletime/qt5.11.patch @@ -0,0 +1,128 @@ +From ed8cb6bbebae11a992b707ad509183c4762d8696 Mon Sep 17 00:00:00 2001 +From: Gary Holmlund +Date: Tue, 5 Jun 2018 17:14:59 -0700 +Subject: [PATCH] Fix bug #140, No window text with Qt 5.11 + +--- + ChangeLog | 3 +++ + src/frontend/btwebenginepage.cpp | 9 ++++++--- + 2 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/frontend/btwebenginepage.cpp b/src/frontend/btwebenginepage.cpp +index c818789de..584a6d5d3 100644 +--- a/src/frontend/btwebenginepage.cpp ++++ b/src/frontend/btwebenginepage.cpp +@@ -35,9 +35,12 @@ BtWebEnginePage::BtWebEnginePage(QObject *parent) + } + + bool BtWebEnginePage::acceptNavigationRequest( +- const QUrl& url, NavigationType /*type*/, bool /*isMainFrame*/) { +- emit linkClicked(url); +- return false; ++ const QUrl& url, NavigationType type, bool isMainFrame) { ++ if (type == QWebEnginePage::NavigationTypeLinkClicked) { ++ emit linkClicked(url); ++ return false; ++ } ++ return QWebEnginePage::acceptNavigationRequest(url, type, isMainFrame); + } + + void BtWebEnginePage::addJavaScriptObject(const QString &name, QObject *object) { +From 517d5be1f4c9e3eaad66a6a44c15e43f4d41b08e Mon Sep 17 00:00:00 2001 +From: Gary Holmlund +Date: Tue, 5 Jun 2018 17:12:14 -0700 +Subject: [PATCH] Fix cmake errors with Qt 5.11 and some cmake warnings. + +--- + CMakeLists.txt | 16 ++++++++++++---- + ChangeLog | 3 +++ + cmake/BTTests.cmake | 9 ++------- + 3 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27236aa7c..2b2f6c382 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,6 @@ + PROJECT(bibletime CXX C) + CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12) ++CMAKE_POLICY(SET CMP0028 NEW) + + IF("${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + MESSAGE(FATAL_ERROR "You probably didn't mean to run CMake from this directory. Now you have all messed up! You'd better delete CMakeFiles/ and CMakeCache.txt or things will break!") +@@ -121,6 +122,10 @@ FIND_PACKAGE(Qt5Core REQUIRED) + FIND_PACKAGE(Qt5LinguistTools REQUIRED) + FIND_PACKAGE(Qt5Gui REQUIRED) + FIND_PACKAGE(Qt5Widgets REQUIRED) ++FIND_PACKAGE(Qt5Xml REQUIRED) ++FIND_PACKAGE(Qt5Test REQUIRED) ++FIND_PACKAGE(Qt5Svg REQUIRED) ++FIND_PACKAGE(Qt5PrintSupport REQUIRED) + + FIND_PACKAGE(CLucene REQUIRED) + FIND_PACKAGE(Sword 1.7.0 REQUIRED) +@@ -154,9 +159,12 @@ ENDIF() + FIND_PACKAGE(Qt5WebEngine QUIET) + IF(NOT Qt5WebEngine_FOUND) + MESSAGE(STATUS "Using Qt WebKit") ++ FIND_PACKAGE(Qt5WebKit REQUIRED) ++ FIND_PACKAGE(Qt5WebKitWidgets REQUIRED) + SET(USEWEBENGINE OFF) + ELSE() + MESSAGE(STATUS "Using Qt WebEngine") ++ FIND_PACKAGE(Qt5WebEngineWidgets REQUIRED) + SET(USEWEBENGINE ON) + ENDIF() + +@@ -194,7 +202,7 @@ ADD_LIBRARY( + STATIC + ${bibletime_COMMON_SOURCES} + ) +-QT5_USE_MODULES(bibletime_common Widgets Xml) ++TARGET_LINK_LIBRARIES(bibletime_common Qt5::Widgets Qt5::Xml) + + IF(MSVC) + ADD_EXECUTABLE("bibletime" WIN32 ${common_bibletime_SOURCES}) +@@ -222,11 +230,11 @@ TARGET_LINK_LIBRARIES("bibletime" + ) + + IF(${BIBLETIME_FRONTEND} STREQUAL "MOBILE") +- qt5_use_modules("bibletime" Widgets WebKitWidgets Qml Quick Xml Network PrintSupport Svg) ++ TARGET_LINK_LIBRARIES("bibletime" Qt5::Widgets Qt5::WebKitWidgets Qt5::Qml Qt5::Quick Qt5::Xml Qt5::Network Qt5::PrintSupport Qt5::Svg) + ELSEIF(USEWEBENGINE) +- qt5_use_modules("bibletime" Widgets WebEngine WebEngineWidgets WebChannel Xml Network PrintSupport Svg) ++ TARGET_LINK_LIBRARIES("bibletime" Qt5::Widgets Qt5::WebEngine Qt5::WebEngineWidgets Qt5::WebChannel Qt5::Xml Qt5::Network Qt5::PrintSupport Qt5::Svg) + ELSE() +- qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network PrintSupport Svg) ++ TARGET_LINK_LIBRARIES("bibletime" Qt5::Widgets Qt5::WebKit Qt5::WebKitWidgets Qt5::Xml Qt5::Network Qt5::PrintSupport Qt5::Svg) + ENDIF() + + SET(BibleTime_LDFLAGS "") +diff --git a/cmake/BTTests.cmake b/cmake/BTTests.cmake +index c3e7aa7d8..aac7eb713 100644 +--- a/cmake/BTTests.cmake ++++ b/cmake/BTTests.cmake +@@ -1,11 +1,6 @@ + + ENABLE_TESTING(true) + +-QT5_ADD_RESOURCES(test_RESOURCE_SOURCES +- ${bibletime_SOURCE_DIR}/src/mobile/btm.qrc +- ${bibletime_SOURCE_DIR}/i18n/messages/test_translate.qrc +-) +- + SET(test_OTHER_SOURCES + ${bibletime_SOURCE_DIR}/src/frontend/messagedialog.cpp + ) +@@ -15,10 +10,9 @@ FUNCTION(test_a_class testDir testClass ) + ${testDir}/test_${testClass}.cpp + ${test_OTHER_SOURCES} + ${test_${testClass}_MOC_SRC} +- ${test_RESOURCE_SOURCES} + ) + SET_TARGET_PROPERTIES("test_${testClass}" PROPERTIES COMPILE_FLAGS ${Sword_CFLAGS_OTHER} -std=c++11 ) +- QT5_USE_MODULES(test_${testClass} Widgets Xml Network Test) ++ TARGET_LINK_LIBRARIES(test_${testClass} Qt5::Widgets Qt5::Xml Qt5::Network Qt5::Test) + TARGET_LINK_LIBRARIES(test_${testClass} + bibletime_common + ${Sword_LDFLAGS} diff --git a/clementine/75f9439843a0e9cdc26cd739d5e1dbd93bd974bc.patch b/clementine/75f9439843a0e9cdc26cd739d5e1dbd93bd974bc.patch new file mode 100644 index 000000000..df07032e1 --- /dev/null +++ b/clementine/75f9439843a0e9cdc26cd739d5e1dbd93bd974bc.patch @@ -0,0 +1,168 @@ +From 948140fab56f593e60b3f623bda5ba1c97f2d6ab Mon Sep 17 00:00:00 2001 +From: Valeriy +Date: Wed, 11 May 2016 17:58:12 +0300 +Subject: [PATCH 1/3] disconnect GVolumeMonitor signals from GioLister before + destroying it fixes #5369 + +--- + src/core/signalchecker.cpp | 9 ++++----- + src/core/signalchecker.h | 6 +++--- + src/devices/giolister.cpp | 18 +++++++++++++----- + src/devices/giolister.h | 2 ++ + 4 files changed, 22 insertions(+), 13 deletions(-) + +diff --git a/src/core/signalchecker.cpp b/src/core/signalchecker.cpp +index 20767f284..2b0505638 100644 +--- a/src/core/signalchecker.cpp ++++ b/src/core/signalchecker.cpp +@@ -21,7 +21,7 @@ + + #include "core/logging.h" + +-bool CheckedGConnect(gpointer source, const char* signal, GCallback callback, ++gulong CheckedGConnect(gpointer source, const char* signal, GCallback callback, + gpointer data, const int callback_param_count) { + guint signal_id = 0; + GQuark detail = 0; +@@ -29,7 +29,7 @@ bool CheckedGConnect(gpointer source, const char* signal, GCallback callback, + if (!g_signal_parse_name(signal, G_OBJECT_TYPE(source), &signal_id, &detail, + false)) { + qFatal("Connecting to invalid signal: %s", signal); +- return false; ++ return 0; + } + + GSignalQuery query; +@@ -39,9 +39,8 @@ bool CheckedGConnect(gpointer source, const char* signal, GCallback callback, + int signal_params = query.n_params + 2; + if (signal_params != callback_param_count) { + qFatal("Connecting callback to signal with different parameters counts"); +- return false; ++ return 0; + } + +- g_signal_connect(source, signal, G_CALLBACK(callback), data); +- return true; ++ return g_signal_connect(source, signal, G_CALLBACK(callback), data); + } +diff --git a/src/core/signalchecker.h b/src/core/signalchecker.h +index 75977e6f5..79b6b5364 100644 +--- a/src/core/signalchecker.h ++++ b/src/core/signalchecker.h +@@ -25,14 +25,14 @@ + #include + + // Do not call this directly, use CHECKED_GCONNECT instead. +-bool CheckedGConnect(gpointer source, const char* signal, GCallback callback, +- gpointer data, const int callback_param_count); ++gulong CheckedGConnect(gpointer source, const char* signal, GCallback callback, ++ gpointer data, const int callback_param_count); + + #define FUNCTION_ARITY(callback) \ + boost::function_types::function_arity::value + + #define CHECKED_GCONNECT(source, signal, callback, data) \ + CheckedGConnect(source, signal, G_CALLBACK(callback), data, \ +- FUNCTION_ARITY(callback)); ++ FUNCTION_ARITY(callback)) + + #endif // CORE_SIGNALCHECKER_H_ +diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp +index 1979f189c..d48cc4806 100644 +--- a/src/devices/giolister.cpp ++++ b/src/devices/giolister.cpp +@@ -94,11 +94,19 @@ void GioLister::Init() { + g_list_free(mounts); + + // Connect signals from the monitor +- CHECKED_GCONNECT(monitor_, "volume-added", &VolumeAddedCallback, this); +- CHECKED_GCONNECT(monitor_, "volume-removed", &VolumeRemovedCallback, this); +- CHECKED_GCONNECT(monitor_, "mount-added", &MountAddedCallback, this); +- CHECKED_GCONNECT(monitor_, "mount-changed", &MountChangedCallback, this); +- CHECKED_GCONNECT(monitor_, "mount-removed", &MountRemovedCallback, this); ++ signals_.append(CHECKED_GCONNECT(monitor_, "volume-added", &VolumeAddedCallback, this)); ++ signals_.append(CHECKED_GCONNECT(monitor_, "volume-removed", &VolumeRemovedCallback, this)); ++ signals_.append(CHECKED_GCONNECT(monitor_, "mount-added", &MountAddedCallback, this)); ++ signals_.append(CHECKED_GCONNECT(monitor_, "mount-changed", &MountChangedCallback, this)); ++ signals_.append(CHECKED_GCONNECT(monitor_, "mount-removed", &MountRemovedCallback, this)); ++} ++ ++GioLister::~GioLister() ++{ ++ foreach(gulong signal, signals_) ++ { ++ g_signal_handler_disconnect(monitor_, signal); ++ } + } + + QStringList GioLister::DeviceUniqueIDs() { +diff --git a/src/devices/giolister.h b/src/devices/giolister.h +index eafa69dc6..c01680bb2 100644 +--- a/src/devices/giolister.h ++++ b/src/devices/giolister.h +@@ -36,6 +36,7 @@ class GioLister : public DeviceLister { + + public: + GioLister() {} ++ ~GioLister(); + + int priority() const { return 50; } + +@@ -137,6 +138,7 @@ class GioLister : public DeviceLister { + + private: + ScopedGObject monitor_; ++ QList signals_; + + QMutex mutex_; + QMap devices_; + +From 806e689d1d4a10ca4012ccfcc770dd7fe98b0107 Mon Sep 17 00:00:00 2001 +From: Valeriy +Date: Wed, 11 May 2016 19:00:30 +0300 +Subject: [PATCH 2/3] replace foreach with range-based for + +--- + src/devices/giolister.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp +index d48cc4806..f1a776bc0 100644 +--- a/src/devices/giolister.cpp ++++ b/src/devices/giolister.cpp +@@ -103,7 +103,7 @@ void GioLister::Init() { + + GioLister::~GioLister() + { +- foreach(gulong signal, signals_) ++ for (gulong signal : signals_) + { + g_signal_handler_disconnect(monitor_, signal); + } + +From cbc7092ed90a5bbf681afd7391cb06d4f2c4ae1e Mon Sep 17 00:00:00 2001 +From: Valeriy +Date: Tue, 17 May 2016 14:47:02 +0300 +Subject: [PATCH 3/3] fix code style + +--- + src/devices/giolister.cpp | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp +index f1a776bc0..aa3bddb34 100644 +--- a/src/devices/giolister.cpp ++++ b/src/devices/giolister.cpp +@@ -101,10 +101,8 @@ void GioLister::Init() { + signals_.append(CHECKED_GCONNECT(monitor_, "mount-removed", &MountRemovedCallback, this)); + } + +-GioLister::~GioLister() +-{ +- for (gulong signal : signals_) +- { ++GioLister::~GioLister() { ++ for (gulong signal : signals_) { + g_signal_handler_disconnect(monitor_, signal); + } + } diff --git a/clementine/PKGBUILD b/clementine/PKGBUILD index ca309f85f..016b800b9 100644 --- a/clementine/PKGBUILD +++ b/clementine/PKGBUILD @@ -1,14 +1,13 @@ pkgname=clementine pkgver=1.3.1 -pkgrel=7 +pkgrel=8 pkgdesc="A modern music player and library organiser and a port of Amarok 1.4, with some features rewritten to take advantage of Qt4." url="http://www.clementine-player.org/" screenshot="http://images.clementine-player.org/screenshots/clementine-1.0-3.png" -license="GPL" +license=("GPL") arch=('x86_64') -install=${pkgname}.install -depends=('gstreamer' 'taglib' 'glew' 'libgpod' 'libmtp' 'libplist' 'liblastfm-qt4' - 'hicolor-icon-theme' 'qtwebkit' 'qjson' 'protobuf' 'crypto++' +depends=('gstreamer' 'gst-plugins-base-libs' 'taglib' 'glew' 'libgpod' 'libmtp' 'libplist' 'liblastfm-qt4' + 'hicolor-icon-theme' 'qjson' 'protobuf' 'crypto++' 'libcdio' 'qca' 'qca-ossl' 'chromaprint' 'libmygpo-qt' 'libechonest-qt4') makedepends=('cmake' 'boost' 'mesa' 'sparsehash') optdepends=('gst-plugins-base: for more open formats' @@ -19,13 +18,37 @@ optdepends=('gst-plugins-base: for more open formats' with ccr yourself' 'dropbox: add support for Dropbox') categories=('multimedia') -source=("https://github.com/clementine-player/Clementine/releases/download/1.3.1/${pkgname}-${pkgver}.tar.xz") -sha1sums=('67f3438d674e075d15859daedfc9f82b638243f7') +source=("https://github.com/clementine-player/Clementine/releases/download/1.3.1/${pkgname}-${pkgver}.tar.xz" + 'clementine-gcc6.patch' + 'add-missing-functional-includes-5630.patch' + 'clementine-1.3.1-chromaprint-1.4.0.patch' + #'clementine-cryptopp6.patch' + 'https://github.com/clementine-player/Clementine/commit/75f9439843a0e9cdc26cd739d5e1dbd93bd974bc.patch') +sha1sums=('67f3438d674e075d15859daedfc9f82b638243f7' + '41dfe9c6b22d60d6d6e83c3a1389a523a52e7946' + '633f88598a257fcac21610cdced1fbecfe144a10' + '9d6a8bc211f94728ff424de680ad3b042176f570' + '579063e7eaad30af93609bb88854ce49728014f6') prepare() { cd ${pkgname}-${pkgver} sed 's, +Date: Mon, 13 Feb 2017 17:46:46 +0100 +Subject: [PATCH] Add missing includes (#5630) + +--- + src/core/mergedproxymodel.cpp | 1 + + src/devices/giolister.cpp | 1 + + src/library/groupbydialog.cpp | 2 ++ + 3 files changed, 4 insertions(+) + +diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp +index 56217f6fd..8c210d391 100644 +--- a/src/core/mergedproxymodel.cpp ++++ b/src/core/mergedproxymodel.cpp +@@ -23,6 +23,7 @@ + + #include + ++#include + #include + + // boost::multi_index still relies on these being in the global namespace. +diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp +index aa3bddb34..5f63ef248 100644 +--- a/src/devices/giolister.cpp ++++ b/src/devices/giolister.cpp +@@ -17,6 +17,7 @@ + + #include "config.h" + ++#include + #include + + #include +diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp +index 5efdc9f36..e5f711b34 100644 +--- a/src/library/groupbydialog.cpp ++++ b/src/library/groupbydialog.cpp +@@ -20,6 +20,8 @@ + + #include + ++#include ++ + // boost::multi_index still relies on these being in the global namespace. + using std::placeholders::_1; + using std::placeholders::_2; +-- +2.13.4 + diff --git a/clementine/clementine-1.3.1-chromaprint-1.4.0.patch b/clementine/clementine-1.3.1-chromaprint-1.4.0.patch new file mode 100644 index 000000000..099704026 --- /dev/null +++ b/clementine/clementine-1.3.1-chromaprint-1.4.0.patch @@ -0,0 +1,41 @@ +From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001 +From: Chocobozzz +Date: Thu, 8 Dec 2016 23:12:17 +0100 +Subject: [PATCH] Add compatibility with chromaprint >= 1.4 + +--- + src/musicbrainz/chromaprinter.cpp | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp +index 9579b62ae..c7ad99e2e 100644 +--- a/src/musicbrainz/chromaprinter.cpp ++++ b/src/musicbrainz/chromaprinter.cpp +@@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() { + ChromaprintContext* chromaprint = + chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT); + chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels); +- chromaprint_feed(chromaprint, reinterpret_cast(data.data()), ++ chromaprint_feed(chromaprint, reinterpret_cast(data.data()), + data.size() / 2); + chromaprint_finish(chromaprint); + +- void* fprint = nullptr; + int size = 0; ++ ++#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4 ++ u_int32_t *fprint = nullptr; ++ char *encoded = nullptr; ++#else ++ void *fprint = nullptr; ++ void *encoded = nullptr; ++#endif ++ + int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size); ++ + QByteArray fingerprint; + if (ret == 1) { +- void* encoded = nullptr; + int encoded_size = 0; + chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT, + &encoded, &encoded_size, 1); diff --git a/clementine/clementine-cryptopp6.patch b/clementine/clementine-cryptopp6.patch new file mode 100644 index 000000000..8197c38fe --- /dev/null +++ b/clementine/clementine-cryptopp6.patch @@ -0,0 +1,25 @@ +diff --git a/src/internet/spotify/spotifyblobdownloader.cpp b/src/internet/spotify/spotifyblobdownloader.cpp +index e34577f5d..045aeeb8a 100644 +--- a/src/internet/spotify/spotifyblobdownloader.cpp ++++ b/src/internet/spotify/spotifyblobdownloader.cpp +@@ -189,7 +189,7 @@ bool SpotifyBlobDownloader::CheckSignature( + + try { + CryptoPP::ByteQueue bytes; +- bytes.Put(reinterpret_cast(public_key_data.constData()), ++ bytes.Put(reinterpret_cast(public_key_data.constData()), + public_key_data.size()); + bytes.MessageEnd(); + +@@ -204,9 +204,9 @@ bool SpotifyBlobDownloader::CheckSignature( + actual_filename.remove(kSignatureSuffix); + + const bool result = verifier.VerifyMessage( +- reinterpret_cast(file_data[actual_filename].constData()), ++ reinterpret_cast(file_data[actual_filename].constData()), + file_data[actual_filename].size(), +- reinterpret_cast( ++ reinterpret_cast( + file_data[signature_filename].constData()), + file_data[signature_filename].size()); + qLog(Debug) << "Verifying" << actual_filename << "against" diff --git a/clementine/clementine-gcc6.patch b/clementine/clementine-gcc6.patch new file mode 100644 index 000000000..24c38735e --- /dev/null +++ b/clementine/clementine-gcc6.patch @@ -0,0 +1,22 @@ +From e31278c05666f8ae0e819bd831c65e8766ba2679 Mon Sep 17 00:00:00 2001 +From: Bigard Florian +Date: Mon, 9 May 2016 11:55:34 +0200 +Subject: [PATCH] Fix projectm compilation with GCC 6 (#5371) + +--- + 3rdparty/libprojectm/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/3rdparty/libprojectm/CMakeLists.txt b/3rdparty/libprojectm/CMakeLists.txt +index e6287f176..0ef785c49 100644 +--- a/3rdparty/libprojectm/CMakeLists.txt ++++ b/3rdparty/libprojectm/CMakeLists.txt +@@ -24,6 +24,8 @@ set(BUILD_PROJECTM_STATIC ON) + set(DISABLE_NATIVE_PRESETS ON) + set(DISABLE_MILKDROP_PRESETS OFF) + ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98") ++ + if(DISABLE_NATIVE_PRESETS) + ADD_DEFINITIONS(-DDISABLE_NATIVE_PRESETS) + endif(DISABLE_NATIVE_PRESETS) diff --git a/clementine/clementine.install b/clementine/clementine.install deleted file mode 100644 index 416aa4993..000000000 --- a/clementine/clementine.install +++ /dev/null @@ -1,14 +0,0 @@ -pkgname=clementine - -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install $1 -} - - -post_remove() { - post_install $1 -} diff --git a/clementine/tokenizer.diff b/clementine/tokenizer.diff deleted file mode 100644 index dca3ff859..000000000 --- a/clementine/tokenizer.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- src/core/database.cpp -+++ src/core/database.cpp -@@ -265,7 +265,17 @@ - StaticInit(); - - { -- QSqlQuery set_fts_tokenizer(db); -+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER -+ QVariant v = db.driver()->handle(); -+ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) { -+ sqlite3* handle = *static_cast(v.data()); -+ if (handle) { -+ sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL); -+ } -+ } -+#endif -+ -+ QSqlQuery set_fts_tokenizer("SELECT fts3_tokenizer(:name, :pointer)", db); - set_fts_tokenizer.prepare("SELECT fts3_tokenizer(:name, :pointer)"); - set_fts_tokenizer.bindValue(":name", "unicode"); - set_fts_tokenizer.bindValue( diff --git a/clipgrab/PKGBUILD b/clipgrab/PKGBUILD index 59d38df1c..fed0723d6 100644 --- a/clipgrab/PKGBUILD +++ b/clipgrab/PKGBUILD @@ -1,20 +1,29 @@ pkgname=clipgrab -pkgver=3.6.5 -pkgrel=2 +pkgver=3.6.8 +pkgrel=1 pkgdesc='A video downloader and converter for YouTube, Vimeo, DailyMotion, MyVideo and many other' arch=('x86_64') url='https://clipgrab.org/' screenshot='http://download.clipgrab.de/img/screenshot_videosearch_x11.png' license=('GPL3') -depends=('qtwebkit' 'ffmpeg' 'libxslt') +depends=('qt5-webkit') +makedepends=('ffmpeg') +optdepends=('ffmpeg: for the conversion functionality') source=("https://download.clipgrab.org/${pkgname}-${pkgver}.tar.gz" - "${pkgname}.desktop") -sha256sums=('cc13512f2ca731b27d177d8f31780147d912ac8fc68a341748d53182811daade' - 'a12c0501d2f46b4a2a7103a0cce8a35d9b44245dee6cc12eb7d3e5c083cc5809') + "${pkgname}.desktop" + https://gitlab.com/kikadf/clipgrab-qt5/raw/patch/patch/clipgrab-qt5-${pkgver}.patch) +sha256sums=('1704386b88d2d17ed7d56dc62e5285a04fc27bcb6576f11d6798d674de49f729' + 'a12c0501d2f46b4a2a7103a0cce8a35d9b44245dee6cc12eb7d3e5c083cc5809' + '3f9edd160e451c3e648d36d953fe2d2ba939152677609382f85e3b19ac8db42a') + +prepare() { + cd clipgrab-$pkgver + patch -p1 -i ../clipgrab-qt5-${pkgver}.patch +} build() { cd ${pkgname}-${pkgver} - qmake clipgrab.pro + qmake-qt5 clipgrab.pro make } diff --git a/emacs-nox/PKGBUILD b/emacs-nox/PKGBUILD index abb99c16b..27fa8d4f2 100644 --- a/emacs-nox/PKGBUILD +++ b/emacs-nox/PKGBUILD @@ -1,6 +1,6 @@ pkgname=emacs-nox pkgver=26.1 -pkgrel=1 +pkgrel=2 pkgdesc='The Emacs Editor, without X11 support' arch=('x86_64') url="https://www.gnu.org/software/emacs/emacs.html" diff --git a/everpad/PKGBUILD b/everpad/PKGBUILD deleted file mode 100644 index 74713ba81..000000000 --- a/everpad/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -pkgname=everpad -pkgver=2.15.8 -pkgrel=3 -pkgdesc="An Evernote client" -arch=('x86_64') -url="http://github.com/nvbn/everpad" -license=('MIT') -depends=('python2-pyside' 'python2-magic' 'python2-oauth2' 'python2-sqlalchemy' - 'python2-beautifulsoup3' 'qtwebkit' 'python2-html2text' 'shiboken' 'sni-qt' - 'python2-dbus' 'python2-pysqlite' 'python2-keyring' 'python2-regex' 'python2-py-oauth2') -makedepends=('python2-distribute') -install=everpad.install -options=('!docs') -source=("https://launchpad.net/~nvbn-rm/+archive/ppa/+files/everpad_$pkgver.orig.tar.xz") # change to launchpad for temerorary no tag on github -sha256sums=('e081fc86afd419c5836b03e0289aa54fe0216b71d037e504ae2eea13a299ae51') - -build() { - cd "${srcdir}/${pkgname}" - - python2 setup.py build -} - -package() { - cd "${srcdir}/${pkgname}" - - python2 setup.py install --root="${pkgdir}/" --optimize=1 - - install -dm 755 ${pkgdir}/usr/share/licenses/${pkgname} - install -Dm644 docs/license.txt $pkgdir/usr/share/licenses/$pkgname/ - - install -dm 755 $pkgdir/usr/lib/python2.7/site-packages/share/everpad/ - install -Dm 644 everpad/pad/editor/editor.html $pkgdir/usr/lib/python2.7/site-packages/share/everpad/ -} diff --git a/everpad/everpad.install b/everpad/everpad.install deleted file mode 100644 index 273c67fb9..000000000 --- a/everpad/everpad.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/feh/PKGBUILD b/feh/PKGBUILD index 09f0894d0..c8a29733d 100644 --- a/feh/PKGBUILD +++ b/feh/PKGBUILD @@ -1,5 +1,5 @@ pkgname=feh -pkgver=2.26.3 +pkgver=2.26.4 pkgrel=1 pkgdesc='Fast and light imlib2-based image viewer' arch=('x86_64') @@ -10,7 +10,7 @@ optdepends=('imagemagick: support more file formats') makedepends=('libxt') categories=('graphics') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha256sums=('3ff3e64db0811e2ff14add77d1aab4ae6d16616f5f78fe54649b49f5aa7f4a21') +sha256sums=('074f8527a17fc5add70018a7f3887d78d5bdf545611636b88641f27e9e844795') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/fpc-qtbindings/PKGBUILD b/fpc-qtbindings/PKGBUILD deleted file mode 100644 index 3d9da8b82..000000000 --- a/fpc-qtbindings/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -pkgname=fpc-qtbindings -pkgver=2.5 -pkgrel=2 -_qt4pas=V"$pkgver"_Qt4.5.3 -pkgdesc='Free Pascal Qt4 Binding' -url='http://users.telenet.be/Jan.Van.hijfte/qtforfpc/fpcqt4.html' -license=('GPL') -depends=('qtwebkit') -arch=('x86_64') -source=(http://users.telenet.be/Jan.Van.hijfte/qtforfpc/V"$pkgver"/qt4pas-$_qt4pas.tar.gz) -sha1sums=('89eb745e17addade5b0965defc93285680cf208c') - -build() { - cd $srcdir/qt4pas-$_qt4pas - qmake - make -} - -package() { - cd $srcdir/qt4pas-$_qt4pas - install -dvm755 $pkgdir/usr/lib - cp -v libQt4Pas.so.5.$pkgver $pkgdir/usr/lib - ln -sfv libQt4Pas.so.5.$pkgver $pkgdir/usr/lib/libQt4Pas.so.5.2 - ln -sfv libQt4Pas.so.5.$pkgver $pkgdir/usr/lib/libQt4Pas.so.5 - ln -sfv libQt4Pas.so.5.$pkgver $pkgdir/usr/lib/libQt4Pas.so -# mkdir -p $pkgdir/usr/include/gdk-pixbuf-1.0/gdk-pixbuf -# cp -v $srcdir/gdk-pixbuf/* $pkgdir/usr/include/gdk-pixbuf-1.0/gdk-pixbuf -} diff --git a/freecad/PKGBUILD b/freecad/PKGBUILD index 496ddca30..90c605d01 100644 --- a/freecad/PKGBUILD +++ b/freecad/PKGBUILD @@ -1,7 +1,8 @@ pkgname=freecad _pkgname=FreeCAD pkgver=0.17 -pkgrel=1 +_rollup=84d6128 +pkgrel=3 pkgdesc='A general purpose 3D CAD modeler' arch=('x86_64') url='https://www.freecadweb.org/wiki' @@ -12,20 +13,26 @@ depends=('boost-libs' 'curl' 'opencascade' 'xerces-c' 'libspnav' 'glu' 'python2-pyside-tools' 'pyside-tools-common') makedepends=('boost' 'eigen3' 'gcc-fortran' 'swig' 'xerces-c' 'desktop-file-utils' 'cmake' 'coin' 'zlib') -install=freecad.install source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeCAD/FreeCAD/archive/$pkgver.tar.gz" + "$pkgname-$_rollup-rollup.patch::https://github.com/FreeCAD/FreeCAD/compare/$pkgver...$_rollup.patch" "${pkgname}.desktop" "${pkgname}.xml" - 'remove-qtwebkit.patch') + 'gcc8.patch' 'smesh-pthread.patch' 'qt5.11.patch') sha256sums=('ae017393476b6dc7f1192bcaf91ceedc2f9b791f2495307ce7c45efadb5266fb' + 'c4a4e084da448c78644e8acc1f3158cf2cb82ee4936b5b79e282497fd62d566e' '321ee7669ad8cce5dd6d7d352b11952c18b37e4b178c94636a3b08079a3e27cb' '248918de7d3c2145b5cc4fbbc9e224d22f4a6ca7ead2680e8c3a32e91772482a' - 'de214a281d421d44b02b469ecf72e36c4d61f10c40431e511e09734aca316baf') + '618bb85c4f3a4eb0e329d1fc30391b777c9b0cffe97aa1e96d45f58b18424311' + '170c90ee6ef64cf3c8e6a35ca94bb1187d346707f7e0779022e614563c6b74f6' + 'a639c9d51f8443e4d2270fe60d5ac3ac62c7c64c532620108514840f8e8704bc') prepare() { cd "${srcdir}/FreeCAD-${pkgver}" - patch -Np1 -i ../remove-qtwebkit.patch + patch -Np1 -i ../$pkgname-$_rollup-rollup.patch + patch -Np1 -i ../gcc8.patch + patch -Np1 -i ../smesh-pthread.patch + patch -Np1 -i ../qt5.11.patch } build() { @@ -37,6 +44,8 @@ build() { -DCMAKE_INSTALL_DATADIR="/usr/share/freecad" \ -DFREECAD_USE_OCC_VARIANT="Official Version" \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DBUILD_QT5=ON \ + -DBUILD_QT5_WEBKIT=OFF \ -DBUILD_START=OFF \ -DBUILD_WEB=OFF make diff --git a/freecad/freecad.install b/freecad/freecad.install deleted file mode 100644 index 67bc02186..000000000 --- a/freecad/freecad.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q - update-mime-database usr/share/mime -} - -post_upgrade() { - post_install -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q - update-mime-database usr/share/mime -} diff --git a/freecad/gcc8.patch b/freecad/gcc8.patch new file mode 100644 index 000000000..06d7e5733 --- /dev/null +++ b/freecad/gcc8.patch @@ -0,0 +1,20 @@ +diff --git a/src/3rdParty/salomesmesh/inc/SMESH_Algo.hxx b/src/3rdParty/salomesmesh/inc/SMESH_Algo.hxx +index a362ed290..7e23608f5 100644 +--- a/src/3rdParty/salomesmesh/inc/SMESH_Algo.hxx ++++ b/src/3rdParty/salomesmesh/inc/SMESH_Algo.hxx +@@ -30,6 +30,7 @@ + + #include "SMESH_SMESH.hxx" + ++#include "SMDS_MeshNode.hxx" + #include "SMDSAbs_ElementType.hxx" + #include "SMESH_Comment.hxx" + #include "SMESH_ComputeError.hxx" +@@ -45,7 +46,6 @@ + #include + #include + +-class SMDS_MeshNode; + class SMESHDS_Mesh; + class SMESHDS_SubMesh; + class SMESH_Gen; diff --git a/freecad/qt5.11.patch b/freecad/qt5.11.patch new file mode 100644 index 000000000..c5a755fce --- /dev/null +++ b/freecad/qt5.11.patch @@ -0,0 +1,310 @@ +From 018b41032a5af616fb861538695f8be14ad120ce Mon Sep 17 00:00:00 2001 +From: sL1pKn07 +Date: Sat, 7 Apr 2018 02:17:49 +0200 +Subject: [PATCH] [For v018] Fix build with Qt5 beta + +Seems need add some headers for build with incoming Qt 5.11 (Tested with 5.11.0beta2) +--- + src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp | 1 + + src/Mod/Fem/Gui/TaskFemConstraintContact.cpp | 1 + + src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp | 1 + + src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp | 1 + + src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp | 1 + + src/Mod/Fem/Gui/TaskFemConstraintForce.cpp | 1 + + src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp | 1 + + src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp | 1 + + src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp | 1 + + src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp | 1 + + src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp | 1 + + src/Mod/MeshPart/Gui/Tessellation.cpp | 1 + + src/Mod/Part/Gui/DlgSettingsGeneral.cpp | 3 +++ + src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp | 1 + + src/Mod/PartDesign/Gui/TaskChamferParameters.cpp | 1 + + src/Mod/PartDesign/Gui/TaskDraftParameters.cpp | 1 + + src/Mod/PartDesign/Gui/TaskFilletParameters.cpp | 1 + + src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp | 1 + + src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp | 1 + + src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp | 1 + + src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp | 1 + + src/Mod/PartDesign/Gui/TaskScaledParameters.cpp | 1 + + src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp | 1 + + 23 files changed, 25 insertions(+) + +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp b/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp +index c3992f9d8aa..cd9b64a9463 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp +@@ -28,6 +28,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp b/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp +index c445ca1c8b7..6fe9898e136 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp +@@ -32,6 +32,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp +index 0a83e737b50..cfb16d9d81b 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp +@@ -32,6 +32,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp b/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp +index 0d864e47ec9..183719432e0 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp +@@ -29,6 +29,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp +index c9964403b4a..8aaacdcf4e1 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp +@@ -29,6 +29,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp b/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp +index 33deb1b005b..94fa4209aa2 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp +@@ -28,6 +28,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp +index 344b8d32ba1..20a636215de 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp +@@ -32,6 +32,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp +index b4c3cb03bb3..29d90c3341b 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp +@@ -30,6 +30,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp b/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp +index 2da2b11cb6b..a85289183f6 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp +@@ -30,6 +30,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp +index 42c0d8f2eb2..88e9029fd5f 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp +@@ -32,6 +32,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp +index 35a1fcf5bf6..e3afeb785c9 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp +@@ -33,6 +33,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/MeshPart/Gui/Tessellation.cpp b/src/Mod/MeshPart/Gui/Tessellation.cpp +index e392d470b7e..7636ad2fbbc 100644 +--- a/src/Mod/MeshPart/Gui/Tessellation.cpp ++++ b/src/Mod/MeshPart/Gui/Tessellation.cpp +@@ -25,6 +25,7 @@ + #ifndef _PreComp_ + # include + # include ++# include + #endif + + #include "Tessellation.h" +diff --git a/src/Mod/Part/Gui/DlgSettingsGeneral.cpp b/src/Mod/Part/Gui/DlgSettingsGeneral.cpp +index d0cf0f94eee..b44eac6ff70 100644 +--- a/src/Mod/Part/Gui/DlgSettingsGeneral.cpp ++++ b/src/Mod/Part/Gui/DlgSettingsGeneral.cpp +@@ -22,6 +22,9 @@ + + + #include "PreCompiled.h" ++#ifndef _PreComp_ ++# include ++#endif + + #include + +diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp +index 78570544845..7e3280065ca 100644 +--- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp +@@ -25,6 +25,7 @@ + + #ifndef _PreComp_ + # include ++# include + #endif + + #include "ui_TaskBooleanParameters.h" +diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp +index 330d5853512..4600cc25b62 100644 +--- a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp +@@ -24,6 +24,7 @@ + #include "PreCompiled.h" + + #ifndef _PreComp_ ++# include + #endif + + #include "ui_TaskChamferParameters.h" +diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp +index 556fc92ae1f..020148001cd 100644 +--- a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp +@@ -25,6 +25,7 @@ + + #ifndef _PreComp_ + # include ++# include + #endif + + #include "ui_TaskDraftParameters.h" +diff --git a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp +index 3c4025574ad..5e0c31ec64a 100644 +--- a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp +@@ -24,6 +24,7 @@ + #include "PreCompiled.h" + + #ifndef _PreComp_ ++# include + #endif + + #include "ui_TaskFilletParameters.h" +diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp +index 532936310be..1970db7ef08 100644 +--- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp +@@ -25,6 +25,7 @@ + + #ifndef _PreComp_ + # include ++# include + # include + #endif + +diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp +index 084ab353c35..f8e96fd6c52 100644 +--- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp +@@ -25,6 +25,7 @@ + + #ifndef _PreComp_ + # include ++# include + #endif + + #include +diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp +index 1fe452a593e..d5a5317ae80 100644 +--- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp +@@ -25,6 +25,7 @@ + + #ifndef _PreComp_ + # include ++# include + #endif + + #include "ui_TaskMultiTransformParameters.h" +diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp +index 874273f63e6..79c564d0965 100644 +--- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp +@@ -25,6 +25,7 @@ + + #ifndef _PreComp_ + # include ++# include + # include + #endif + +diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp +index 593664c9bdb..acaacce6ee8 100644 +--- a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp +@@ -25,6 +25,7 @@ + + #ifndef _PreComp_ + # include ++# include + #endif + + #include "ui_TaskScaledParameters.h" +diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp +index b3f17f299d4..5b907304fcc 100644 +--- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp +@@ -24,6 +24,7 @@ + #include "PreCompiled.h" + + #ifndef _PreComp_ ++# include + #endif + + #include "ui_TaskThicknessParameters.h" diff --git a/freecad/remove-qtwebkit.patch b/freecad/remove-qtwebkit.patch deleted file mode 100644 index 555c38061..000000000 --- a/freecad/remove-qtwebkit.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/src/Gui/DownloadManager.cpp b/src/Gui/DownloadManager.cpp -index 98b767d34..31defb46d 100644 ---- a/src/Gui/DownloadManager.cpp -+++ b/src/Gui/DownloadManager.cpp -@@ -33,9 +33,6 @@ - #include - #include - #include --#if QT_VERSION < 0x050000 --#include --#endif - #if QT_VERSION >= 0x050000 - #include - #endif -@@ -217,12 +214,6 @@ void DownloadManager::updateRow() - ui->downloadsView->setRowHeight(row, item->minimumSizeHint().height()); - - bool remove = false; --#if QT_VERSION < 0x050000 -- QWebSettings *globalSettings = QWebSettings::globalSettings(); -- if (!item->downloading() -- && globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) -- remove = true; --#endif - - if (item->downloadedSuccessfully() - && removePolicy() == DownloadManager::SuccessFullDownload) { diff --git a/freecad/smesh-pthread.patch b/freecad/smesh-pthread.patch new file mode 100644 index 000000000..349701548 --- /dev/null +++ b/freecad/smesh-pthread.patch @@ -0,0 +1,18 @@ +--- a/src/3rdParty/salomesmesh/CMakeLists.txt 2018-04-06 10:48:37.000000000 +0200 ++++ a/src/3rdParty/salomesmesh/CMakeLists.txt 2018-04-06 10:48:37.000000000 +0200 +@@ -85,6 +85,7 @@ + else(MSVC) + if(BUILD_FEM_NETGEN) + set(SMESH_LIBS ++ pthread + ${NGLIB_LIBRARIES} + ${OCC_LIBRARIES} + ${OCC_OCAF_LIBRARIES} +@@ -92,6 +93,7 @@ + ADD_DEFINITIONS(${NETGEN_DEFINITIONS}) + else(BUILD_FEM_NETGEN) + set(SMESH_LIBS ++ pthread + ${OCC_LIBRARIES} + ${OCC_OCAF_LIBRARIES} + ) diff --git a/kdelibs/PKGBUILD b/kdelibs/PKGBUILD index 064643cd1..0342abffe 100644 --- a/kdelibs/PKGBUILD +++ b/kdelibs/PKGBUILD @@ -12,7 +12,7 @@ options=('!docs' 'debug') depends=('qt=4.8.7' 'shared-mime-info' 'upower' 'udisks2' 'xz' 'enchant' 'jasper' 'openexr' 'giflib' 'libxtst' 'ca-certificates' 'xdg-utils' 'qca' 'polkit-qt4' 'libxss' 'phonon' 'shared-desktop-ontologies' 'attica>=0.4.2' 'krb5' 'libxcursor' 'libutempter' 'hicolor-icon-theme' 'libdbusmenu-qt' - 'media-player-info' 'qtwebkit' 'systemd' 'pcre') + 'media-player-info' 'systemd' 'pcre') makedepends=('pkg-config' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 'aspell' 'hspell' 'shared-mime-info' 'docbook-xsl' 'docbook-xml' 'bzip2>=1.0.6' 'libzip' 'libpulse') optdepends=('phonon-gstreamer: GStreamer Phonon backend (default)' @@ -23,16 +23,19 @@ optdepends=('phonon-gstreamer: GStreamer Phonon backend (default)' 'aspell: Spell checking' 'hspell: Hebrew spell checking') groups=("kde" "kde-minimal" "kde-uninstall") -source=("https://download.kde.org/Attic/applications/$_kdeappver/src/$pkgname-$pkgver.tar.xz" +install=${pkgname}.install +source=("https://download.kde.org/Attic/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz" 01_chakra_tag.patch 02_kde_applications_menu.patch 03_chakra_menu.patch - MergeDir.patch) + MergeDir.patch + kdelibs-no-kdewebkit.patch) sha256sums=('37fd43a34e8118406e03a5d0e53f4a03c8aa50b219e8484a5d42349dc0f2c3fe' '029e2d07c5fc8676d143b903aa181fc470e5b469d49ccf107e19031f562bf4e3' 'b2d25c76081ea6bb31d90c4c6b619ce64ac36de3a6eefb2f9990d3dbf8cd9c91' '505e9e5e969be5094b3f713b865d5927cc3de1f4693915174732b20793228c4f' - 'd7d2fac1ceb1551081a5f3fa860c14d4aeb0c774d56067e931c20b8d79c4450f') + 'd7d2fac1ceb1551081a5f3fa860c14d4aeb0c774d56067e931c20b8d79c4450f' + '2df372f1bfcef1902349f9ca8820315030d39dd2bb769776b94fd3fcbf9621f5') prepare() { # main patches @@ -41,6 +44,9 @@ prepare() { patch -Np1 -i ${srcdir}/01_chakra_tag.patch patch -Np1 -i ${srcdir}/02_kde_applications_menu.patch patch -Np1 -i ${srcdir}/03_chakra_menu.patch + + # disable kdewebkit (Fedora) + patch -p1 -i ../kdelibs-no-kdewebkit.patch # right positioning of applications' entries in kmenu patch -p1 -i ${srcdir}/MergeDir.patch diff --git a/kdelibs/kdelibs-no-kdewebkit.patch b/kdelibs/kdelibs-no-kdewebkit.patch new file mode 100644 index 000000000..d204a3748 --- /dev/null +++ b/kdelibs/kdelibs-no-kdewebkit.patch @@ -0,0 +1,100 @@ +diff -up kdelibs-4.14.16/CMakeLists.txt.webkit kdelibs-4.14.16/CMakeLists.txt +--- kdelibs-4.14.16/CMakeLists.txt.webkit 2016-01-07 00:02:22.000000000 +0100 ++++ kdelibs-4.14.16/CMakeLists.txt 2016-01-28 13:03:53.556194927 +0100 +@@ -356,7 +356,6 @@ if(NOT WINCE) + add_subdirectory( plasma ) + endif(NOT WINCE) + add_subdirectory( kunitconversion ) +-add_subdirectory( kdewebkit ) + add_subdirectory( includes ) + + add_subdirectory( experimental ) +diff -up kdelibs-4.14.16/kdewidgets/CMakeLists.txt.webkit kdelibs-4.14.16/kdewidgets/CMakeLists.txt +--- kdelibs-4.14.16/kdewidgets/CMakeLists.txt.webkit 2016-01-28 13:03:53.527196020 +0100 ++++ kdelibs-4.14.16/kdewidgets/CMakeLists.txt 2016-01-28 13:03:53.556194927 +0100 +@@ -88,41 +88,6 @@ if(QT_QTDESIGNER_FOUND) + install(TARGETS kdedeprecated DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) + endif(NOT KDE_NO_DEPRECATED) + +- +- # kdewebkit widgets +- include_directories( +- ${CMAKE_SOURCE_DIR}/kdewebkit +- ) +- +- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp +- COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit.widgets +- MAIN_DEPENDENCY kdewebkit.widgets DEPENDS makekdewidgets) +- +- set(kdewebkitwidgets_PART_SRCS +- classpreviews.cpp +- ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp +- ) +- +- qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.moc) +- +- +- qt4_add_resources(kdewebkitwidgets_PART_SRCS kdewebkitwidgets.qrc) +- +- kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS}) +- +- target_link_libraries(kdewebkitwidgets ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY}) +- if(NOT WIN32) +- set_target_properties(kdewebkitwidgets PROPERTIES +- INSTALL_RPATH_USE_LINK_PATH TRUE +- SKIP_BUILD_RPATH TRUE +- BUILD_WITH_INSTALL_RPATH TRUE +- INSTALL_RPATH ${LIB_INSTALL_DIR} +- ) +- endif(NOT WIN32) +- +- install(TARGETS kdewebkitwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) +- +- + if (QT_QT3SUPPORT_FOUND) + + include_directories( +diff -up kdelibs-4.14.16/plasma/CMakeLists.txt.webkit kdelibs-4.14.16/plasma/CMakeLists.txt +--- kdelibs-4.14.16/plasma/CMakeLists.txt.webkit 2016-01-07 00:02:22.000000000 +0100 ++++ kdelibs-4.14.16/plasma/CMakeLists.txt 2016-01-28 13:26:55.730137496 +0100 +@@ -11,6 +11,7 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL + endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) + + set(PLASMA_NO_PACKAGEKIT TRUE) ++set(PLASMA_NO_KDEWEBKIT TRUE) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR} + ${KDE4_KDECORE_INCLUDES} +@@ -121,7 +122,6 @@ set(plasma_LIB_SRCS + framesvg.cpp + plasma.cpp + popupapplet.cpp +- private/animablegraphicswebview.cpp + private/applethandle.cpp + private/associatedapplicationmanager.cpp + private/componentinstaller.cpp +@@ -211,7 +211,6 @@ set(plasma_LIB_SRCS + widgets/textbrowser.cpp + widgets/treeview.cpp + widgets/textedit.cpp +- widgets/webview.cpp + + #Temporary QtJolie branch + private/qtjolie-branch/qtjolie/abstractadaptor.cpp +@@ -275,7 +274,7 @@ endif(PHONON_FOUND) + + kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS}) + +-target_link_libraries(plasma LINK_PRIVATE ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ++target_link_libraries(plasma LINK_PRIVATE ${QT_QTUITOOLS_LIBRARY} + ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} + ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_THREADWEAVER_LIBS} ${PLASMA_EXTRA_LIBS}) + +@@ -415,7 +414,6 @@ install(FILES + widgets/textbrowser.h + widgets/treeview.h + widgets/textedit.h +- widgets/webview.h + DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/widgets COMPONENT Devel) + + install(FILES diff --git a/konversation/PKGBUILD b/konversation/PKGBUILD index c7242ff3a..b728d3f73 100644 --- a/konversation/PKGBUILD +++ b/konversation/PKGBUILD @@ -2,7 +2,7 @@ source ../kdeapps.conf pkgname=konversation -pkgver=1.7.4 +pkgver=1.7.5 pkgrel=1 pkgdesc="A user friendly IRC client for KDE" arch=('x86_64') @@ -13,8 +13,8 @@ license=('GPL2' 'FDL') categories=('communication') screenshots=('http://konversation.kde.org/screenshots/konversation13_2.png') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('cf14066c73531d75f41934a8c4c29fd6a5f61b24') +source=("https://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha1sums=('c4f702f7eb4e1c869488fe005ddbcb1cbf31951c') prepare(){ mkdir -p build diff --git a/konversation/avoid-dcc-crashes.patch b/konversation/avoid-dcc-crashes.patch deleted file mode 100644 index 0bc7ddb38..000000000 --- a/konversation/avoid-dcc-crashes.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 459d1f949caee1e15ee8d3f1b55dccedf923b1cc Mon Sep 17 00:00:00 2001 -From: shainer -Date: Thu, 5 May 2016 00:36:10 +0100 -Subject: [PATCH] canMoveView{Left,Right} returns a safe default in case of - invalid views. - ---- - src/viewer/viewcontainer.cpp | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/viewer/viewcontainer.cpp b/src/viewer/viewcontainer.cpp -index aafa5cc..a2308bc 100644 ---- a/src/viewer/viewcontainer.cpp -+++ b/src/viewer/viewcontainer.cpp -@@ -54,7 +54,6 @@ - #include - #include - -- - using namespace Konversation; - - ViewMimeData::ViewMimeData(ChatWindow *view) : QMimeData() -@@ -1818,6 +1817,11 @@ bool ViewContainer::canMoveViewLeft() const - - ChatWindow* view = static_cast(m_tabWidget->widget(index)); - -+ // Safeguard in case we get returned an invalid object for some reason -+ if (view == nullptr) { -+ return false; -+ } -+ - if (view->isTopLevelView() && index > 0) { - return true; - } else if (!view->isTopLevelView()) { -@@ -1842,6 +1846,11 @@ bool ViewContainer::canMoveViewRight() const - - ChatWindow* view = static_cast(m_tabWidget->widget(index)); - -+ // Safeguard in case we get returned an invalid object for some reason -+ if (view == nullptr) { -+ return false; -+ } -+ - if (view->isTopLevelView()) { - int lastTopLevelView = -1; - -@@ -2630,6 +2639,7 @@ void ViewContainer::closeDccPanel() - { - // hide it from view, does not delete it - if (m_tabWidget) m_tabWidget->removeTab(m_tabWidget->indexOf(m_dccPanel)); -+ - m_dccPanelOpen=false; - (dynamic_cast(actionCollection()->action("open_dccstatus_window")))->setChecked(false); - } --- -2.7.4 - diff --git a/kraft/PKGBUILD b/kraft/PKGBUILD index 2553a9351..57042a200 100644 --- a/kraft/PKGBUILD +++ b/kraft/PKGBUILD @@ -1,5 +1,5 @@ pkgname=kraft -pkgver=0.80 +pkgver=0.81 pkgrel=1 pkgdesc="A program suitable for all trades or crafts" arch=('x86_64') @@ -10,7 +10,7 @@ depends=('akonadi-contacts' 'ctemplate' 'python3-reportlab') makedepends=('cmake' 'extra-cmake-modules') source=("https://github.com/dragotin/kraft/archive/v${pkgver}.tar.gz" 'allow-duplicate-cmake-targets.patch') -md5sums=('8afff9d693461091964ac2ef2b156392' +md5sums=('7ea5cf4d0e22ecee19039c9425c691f1' 'fed2110cb8eeb93f85a9e0c8604265eb') prepare() { diff --git a/libmarble4/PKGBUILD b/libmarble4/PKGBUILD deleted file mode 100644 index b896dbfa7..000000000 --- a/libmarble4/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# Include global configuration -source ../kdeapps.conf - -pkgname=libmarble4 -pkgver=15.08.3 -pkgrel=2 -pkgdesc="KDE4 Marble libraries" -url="http://kde.org/applications/education/marble/" -arch=(x86_64) -license=(GPL LGPL FDL) -depends=(qtwebkit libastro marble-data) -makedepends=(cmake automoc4 gpsd libwlocate) -optdepends=('gpsd: GPS support' 'libwlocate: WLAN based geolocation') -conflicts=('kdeedu-marble') -provides=('kdeedu-marble') -source=("http://download.kde.org/stable/applications/$pkgver/src/marble-$pkgver.tar.xz") -sha1sums=('203fa8418c5af94aa3b0f4f16991edc7fb3bbcd7') - -prepare() { - mkdir -p build - - # rename include dir - sed -e 's|marble/MarbleModel.h|marble4/MarbleModel.h|' -i marble-$pkgver/FindMarble.cmake.in -} - -build() { - cd build - cmake ../marble-$pkgver \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_MARBLE_TESTS=OFF \ - -DBUILD_MARBLE_APPS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DQT5BUILD=OFF \ - -DMARBLE_PLUGIN_PATH=/usr/lib/marble4/plugins - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install - - # move cmake file - install -Dm644 "$pkgdir"/usr/share/marble/cmake/FindMarble.cmake "$pkgdir"/usr/share/apps/cmake/modules/FindMarble.cmake - - # remove files provided by libastro and marble-data - rm -r "$pkgdir"/usr/include/astro - rm -r "$pkgdir"/usr/lib/libastro.* - rm -r "$pkgdir"/usr/share/{appdata,applications,icons,marble} - - # rename include dir to avoid conflicts with marble - mv "$pkgdir"/usr/include/marble{,4} -} - diff --git a/librelp/PKGBUILD b/librelp/PKGBUILD index d7071b8a8..0f7448bf5 100644 --- a/librelp/PKGBUILD +++ b/librelp/PKGBUILD @@ -1,13 +1,13 @@ pkgname='librelp' -pkgver=1.2.15 +pkgver=1.2.16 pkgrel=1 pkgdesc="The Reliable Event Logging Protocol" -url="https://www.librelp.com/" +url="https://www.rsyslog.com/librelp/" arch=('x86_64') license=('GPL3') depends=('gnutls') -source=("https://github.com/rsyslog/librelp/archive/v${pkgver}.tar.gz") -sha1sums=('a44417967515d97d25e7826c4c5a95280e24fc4c') +source=("http://download.rsyslog.com/librelp/librelp-${pkgver}.tar.gz") +sha256sums=('0c235dd2a01060ad5e64438879b31ae64e7640d0e262aa1a287a2dd9bc60fd53') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/libreoffice-i18n/PKGBUILD b/libreoffice-i18n/PKGBUILD index 8e51809fb..6d6eedd5e 100644 --- a/libreoffice-i18n/PKGBUILD +++ b/libreoffice-i18n/PKGBUILD @@ -1,7 +1,7 @@ pkgbase="libreoffice-i18n" -_rcver=6.0.4.2 -pkgver=6.0.4 +_rcver=6.0.5.2 +pkgver=6.0.5 pkgrel=1 depends=("libreoffice-common>=$pkgver") @@ -179,179 +179,179 @@ for _lang in "${_languages[@]}"; do _package $_lang }" done -md5sums=('11b768edf8bfa5355af22a626fa7d015' - 'e31ca547589e1d943538672f694ce507' - 'f494bd22625d05f940a2d2864061c2a6' - '7596097f3a9b0394e539a8566167c8c1' - '33f5948480ddd7172bc9549b9f3a3ab1' - 'c08f99c80068fb979aaff8f93ae473da' - 'b56196906bef8c4b2ce0a5325f937450' - 'd7cbd853cf904a003a2a1b255606fcb5' - '88455b5ba23dc7a8cc586a0a82bf44c1' - '6276f9ed2a120b696f72f2d5a8d296ac' - 'c93874a34421120107c316449259fce4' - 'c1d07fabbb92ebb6180d9bc4b2be39e8' - '27759499d7d28a2bd6dca0e698553d66' - '3c9ab12f8480fccccc640087d9523b15' - 'e4fe20162b01a7112a8eab0ef66aeb33' - 'd007909d18b39e21149b849e5c9a6e39' - 'b1b3ec37c25e3e143af8f6dd8a0cd2db' - '05fb7c0784dc3cd52a14b49fefd9a431' - 'e42b65de0d2ef50ca820ea56f2655377' - '34fb9b495d672d3c49aea74e645c4088' - 'ef65e097215ef6446d6a17dc70c9fd99' - '8d64c4e4c2b520cff1cf9f0e38a85850' - '44caa4f4e7c250f661a1c086bbb69f7b' - '4403b2abc354cb45e0842d29d4cd2bc3' - 'f71496348ffd107b18af552f42c3c651' - '67f02fa89634b698316a4fae941501ed' - '9796b7a8eb97548ab46966a5d094d031' - '6b7a638ea40462e08199439d6e9f8627' - '2f7a68d38f34857da8907c735b8df8df' - '7b4497c86e5f4f802f79bccbe682a733' - '80f58a1a41acda8817864e2b07848b9b' - '3df9c9bbb487120589a8d89996c0ba8b' - '3fc010d0e07b4d5ac029322b0cb45d8c' - 'd9b65db5771ec25666ff7145a31b1b4b' - '480bf67d95321adf27100a1bf754da8c' - '517ec9ab84ecd1585eca3f9200bc20dc' - 'f7969297e799a59733c3d8f5dc3c177e' - '0b7172cbc92b2919fa9ec1be08ffdfae' - 'fa6850f0fa0c795157e35e783e665d20' - '00059e6215573632e7e94ee9aee63f9e' - 'f5c84bf956345c239edf6d6a7a663211' - '0642709de9fac3eebc5c886eca32cd38' - '193b9aca8b20de232f03bac34d09e775' - '4f9e6a3c326f47ffa5cba49afbbb4b2b' - '3422c12d2283e178ac50384eae869e11' - '75897ff6dddde248329729f23b071f8c' - 'a61e596bc911ce723993ce142a9ae836' - '61c8f8a6816e790428be0b5a2b9d7420' - 'ffd08b708e8ddd3842e86763c5180d6e' - '9092bd2ad525e53f5b4a100148d5f2e6' - '719d8fbbc17052d6482cbc8a506bb946' - '311a441606d27b05317cb0095d964037' - '7246d3c923841d8a92370be43d63428e' - '185accdb20a3076c3492f184e2d3383d' - 'd9ed138017c3fd237c69f90d9a47e5e7' - '2e51c42e078c71c4b3e2b45680caa38f' - '5cf125ab4b8d74b4a36bf035483371bb' - '1575455b9b1af42fd7d4955273964cc9' - '2eda0caa752287ee47212bb192b6771c' - 'ae82db15b83710b6e3f9e8e11af2e672' - '2356736a7012af43c6493923c610544a' - '7ce1c138e7f511a4eb33a1de360aaa3c' - '9cfeb90e9b0bfab9141798ec5b2fbba3' - '0535d7358fca7fdea6f50d7274c9260f' - '8371691f0e4388d2462aaf3a811a6da3' - '1e5ad2fbf7c940ed59d6f3148372c0a7' - '920dffc6ed54d4c5a01fb1f84c5c6310' - 'f97bdcfb37b422601ae7f4a17be4665f' - '4ac1f9a0d90a633f3c9560d2e395c6f5' - 'fe3210ecaf0d2b49574ac732ec93b72f' - '71f1713c34a29381c1ebf564e38d360c' - '2fe20b4a2abb74360a0f4a3736dda6f5' - 'bfcf0b8293c50710825c8d12e6338b40' - '7917e5b97baf657f211479618e3466de' - 'e547a5e02482604a901cbab917194ec6' - 'ee4fb2d9930f9fcdb1fc156a967892b3' - '70f5d018cac05254e7d8bafa02fc1280' - 'a57ff39a08de8acb7eefbb969a9b9046' - 'de4b1b18d2d807413748f3b4698abad5' - 'b5ad490e968fdd61945baded2df01409' - '45590007a4d7ad24afbc1a1f9f18ccce' - '5b9d3ee13d0049b69afa21e8df987410' - '1356824113def9ceb2ccc8f48ca6d09f' - '5be0ed6c844aca2752a0d6ed53b3cd76' - '3519be506ef52f43679d5dbd378278ca' - 'f17b49da25606dc1279a2b5ecd139e94' - '8686c37d7eca308ab08ea244b1321378' - '73836cdd1d4f7ff7fc072dd1de5e0acc' - 'e06a35386772327703e8d1cf6fe7ddf2' - 'eaff6ff896aa9fb84c8bbd118fa723f6' - '533a05dcab4d700b1f8fdaedbd7e0224' - 'bf40a66ea76960fb8c51d3aba0826fa9' - '80b93ac2ce77e81eafe250e2ae1d174a' - 'f2d3e5f569ee613592a44bbf4bc107e3' - '179b5210ef8c5e1e0e7f3e2d02f30e18' - '434ffbfbb83706c3c2146857a1496f26' - '5c49d26983e0e473a5d390b2e38cc7d6' - '0ac43df38db469251d7b4051b13f0615' - '6d165a7c75139d60e8c66f231ac47e46' - '3f0b2d007c89ddccfecb87d0fae566ee' - 'ef09b353a33d6f868beedc4bb286d9c5' - '5323c52583aefea6c76a4d7ba5a59bf8' - 'cefc73a32fdbcd2924d3241cbecd5796' - '24a284498d2ebf990a1e063f7f07f84c' - 'b717413183b0750c27635544a165da67' - 'fadf76ef8b7b4113d6aa4f49a219b61e' - 'dc9b939843e8cec3cde3ae59782f3ec2' - '10ca500ce21b0fd5364fc0ed2667ffcb' - '11f7880e081a6013aedb6ebcf3a3db4f' - '5ec6b7b35203cc660bcf02d29dcee738' - 'ed33c6df9c79d93af0f83cad6990d410' - '92ef4fc4619504063072c6951a98c718' - '5a06157840a73dbb918ce3483b52f1cf' - '0fc42e401c9568dd84112d0d0102a193' - 'df048256e2482006fc8dce843be3c3e0' - '635dce53e742940d6c1da427b5eb7333' - '08eee179e25edfbc1b8ad26050bf9b24' - '937b0acdb22ea0cd7925b09f97906573' - 'e6cdd60e02712dd989d9963518876382' - 'f8f046e28063596687ee17d4d7461793' - '9034006d8433aa25273a50afcc2856aa' - '902ebb3c9ec7d26d24124991eca77f2a' - 'a00a6a46f4aa655b8cc6fa7686ea0665' - 'ca046dbb7883f4791cfc23b720e71b20' - '137a7ac97918953411ec9d63c3235a32' - '127ba8dffc5d75dee067843a807a02c3' - '92e88c872903e503831ca53d01d98e9e' - '4580398212a7be0bedb28a896926371f' - '42903d168e669f8cd66d234bd3135690' - 'cce945db7b99c9b67fcc9040a047e3d0' - 'f5f9e01d715a510ef7584262d6344e66' - 'eefbba679137d4d3416a1821e2621516' - '748ab5080f7276b95dc83642bac629d0' - 'af55ca70c298daad3a7063bb40c092e1' - '9fb8997b64e0850c1a3c22c391fddb98' - 'f0e648fd1c170181019fb8693610e79b' - 'f747d114f75f668ceaac33aeacb67c3a' - 'ef7b2823d1107df7a663e1bfa9c6a618' - '9b35dd2302b2fb69cf94a05e6e7023d5' - '921a5b63d619508d498ab97460f2eba9' - '790fc44ed36d9c38e27088b8f87e1be5' - '71b40f14191229018032ae4949794711' - '4122cd747d16c7bd39081e4c78790eee' - 'ac8594d97d1c751796f89f070d819488' - 'c972a021aed54ddc53bc9898f96a35f5' - 'ae6c10490b71a71d1f6dc7452c8623bd' - 'a9f46fe2b0debbef21418745a953314b' - '6418ebe08d105b18015fa4cea79c3b16' - '6b5d835d5c49fc69c94b7017b1c84dbe' - 'fb9755ae286c548002e59899d217ffd6' - 'a6d960fc4dff98ce7e1d6786b2a0c431' - 'e8f9f3a1f270e418827e1ded23ad5733' - 'd4a287027681270ccbf7ceb37dda8357' - 'e68249d99d76835123446fbc777b9afb' - '0a30faaa92e7f22e1a2161f812e502ce' - '9d54587914d453adbdbe1a4cd665e47e' - 'e402cfc14b10f737a3316f28e59cc950' - '81a03f05c35cd408d150f1f7810a178e' - 'a3303f9c3e994c10ec59deedf135ee13' - '84dc20868c509c0c7dbd1ad26548dd38' - '8829af24b5d0a1422387468dc97d16f8' - 'b8f791ce845eff3eb47bb907b9687a4b' - '07b93275f0bdb58a36796d7fcfc4e3e7' - 'af2535fc2ae4b732f753a36ed1de19ae' - 'cd9cee08bb403d122ee3a65dbf9c2f84' - 'c48f100c7b9f07278cef9cda49507251' - '10fc298f5d4b8bf3c208ee4f6e4cc29c' - '4d3d5008f64b1e285652298bcb97ffc2' - '9f647c0dbde0039eb7fdc6342dd22b2e' - '5ca1d3643105e338413ea9585c675a73' - '15bf04639c57fc56f71cd75984242f71' - '6c175072bb128468da1af4434588f1ef' - '9945412265108728266622ad28184497' - 'c01a7bb39a31907e18038c996e8cddad' - 'fcbaa3e44166b426b2a5e1df2957b1f0' - '01d3d57d99315f02b096b58d7775b271') +md5sums=('bb543ac029a6920dc6347538474dba62' + '81af9d7f5d51236ba8178e2eff28e59e' + '80897e8b23e2355035e3cd46e2b1144f' + '3c316ea9bb19f4f8d6cce5f6c3e1cb5d' + '9f4f50976959ca4ac1eec2d4eab3adc2' + 'fdd3268e2e41cc031c060739d345b4e2' + '802a80b48c50db78ab121c26febc5edd' + 'fe8540e0a85c68862ae059ddb307bc26' + '166b059cf61fa42eb4118113d63ce579' + 'bc1f4461d12c05119258b8eb20aaf96f' + 'f0f6abeaa21bded390930e25ced4fe97' + '4343cb1e0e78832009bb8567212e1e2d' + 'e954cc4ea0dc33b384540521133b4e4f' + '6d6152b355ab2d5f399a953b736e770c' + '69d621d9ff0f8765508ab0c805ab8626' + '6eb3b7aaa07f00c63bf9916b6ede6a25' + 'eed4111260298d1979248afb06a88c66' + '12aceadfaa95d208a569e3a14ac60d03' + '91a8956c427be60c20c09d2fe44ac6bf' + '7f73bf5a2f0a245d70c2842d7d310271' + '35f7a86e4b16e9747757693e0482ee9c' + 'f2d16a8a3503e02a367466d625ee1f59' + 'ce564b11e290343da53a5269d561e772' + 'ba379478bb90ba5976eb61ec069a3a70' + '9570b7b95fd13faeab184dadfbe2cfc1' + '0734a4ceacda11ea55d96a2987e88e13' + '577913269cdca6d188c7695509f65b69' + '27432eef7f64a398fb49ba9a0cfb0496' + 'f22c9e484dd6a0b36f3d48d22016f76b' + '82d6eabd77019d6e471ec72c81f9227d' + '95e9b02f9afd38140f03c000b463e16d' + '730be7aac0ffeec8a8beb1a809f90cf5' + '50e1dc944437e1b6a356ff89d68fa5af' + 'ed13fc49a7ce506fb1ff40e9b26c1ff0' + 'e553abbe4126926946c0b12e67519eba' + '136d3b6818c85246ffc87e2634749f83' + 'e259c3d04086ade8d9dc35187e107cd1' + '22ffd81787544f5f5f68fc7859ee6276' + '9a85d9b659ef69c1a7661851a8693f57' + '5aa8d31ebe29bedc77abdf0af05edb8b' + '3a26563b515367442d704b8163a073e5' + '1d6c7eb5f7c10e855f8da8b9dfb3a4a1' + 'f57a68d5b9241bc5d22c1c5f4bfd2fd3' + '9f1e6944789f2f37a233b48955cbdf25' + 'fcdff3947090640fdccc96ce5aae93ff' + '42378d98739e730a457509ab4506fb44' + '565182f37bba816a7e04653631663a44' + 'f471c4b95ed70f8a00d4cbfb7c5555c1' + 'be8653d19c255687fcc54abf0247501d' + '79c91978ee391ddbc296d37a4764bd4b' + '4a96af816a58b24aae4e7123e23928d7' + '6c6b71214b3ce601b3e775119174e6dc' + 'e1265b9d7e4646c8e0420eb4db1d4fb9' + '13d1f4d06e27963ffcdcee8f84a1de10' + '4342975187cbf7826dbadd4854d1ad3f' + '228c82096bb3283b8f47f27e77b7f2c0' + 'a097ada7be81d950d015c9b1901eb22b' + '2ab9523d12fcffcbf2b5e2359ee4659e' + 'a4ebf73bfb87e499dd38d8b6aa076437' + 'd2b20f56b4c1dc7f5ddfd57a57eab19c' + 'c793fe51d97fd4f31348927934cf2f28' + 'dda90ce897349faa37b0c8ad89282057' + '9560c4725dd4051b1bb403c9890b6c3b' + 'a05413e908832ab847ea44a4ed102585' + 'fd8e01c89b3c21b81ffc68b8acdb6b5c' + 'c54848984896b752d8c7a753e33a51c3' + 'eca36e6bca447870a5b04346e601d027' + 'e4dced419538deb0ece3123097314def' + 'c3fddce4881c171aefd36810b5f3b206' + '4d936a33f00061ccaca9146295810e52' + '04a327567f54c6c4e4f078eac4d6a46e' + 'eec64568791cd8b35218b0d3b5551e01' + '1a6d4c50679c1e17b687d4b62fb22abf' + 'fe44a9a1877ab1d96e2e29c8878eaeaf' + 'c37d544b43f86d4cb1294f8bde33b74c' + '6589a2b3c3424bd77ed8b2f143c2c0da' + '669644296644fc020b66917e738805d1' + '288c2a85df874dbb8bee051945c06f33' + 'c7c2354c635d808ae9a074e5ad962434' + 'd00b136b59cf813b4ac0d40cfa329381' + '9d47617d6e833c4ce18cf21867df1dda' + '848da80d2bb0d7a3dd53c3e10a8f922d' + '73e1fd0a9e7b14145459cddb44105117' + 'fdbdf26b965ca95f99cfeaf759bbeb9c' + '4765a28efc1d6a4eec65379fd108f761' + '07e9bb215f8e870a17ce15d2ac3b6dde' + 'cbd706c3cce528522e90e4b82d2a4e58' + '97b3d4373636a0bddd923dff6af7a459' + 'ebff2eace3fd81e6f9fe22deac03a803' + 'a093b0074d66b1881209e52c7ac8507f' + '63ecb50043c1ad9bfd1c894129d83403' + 'e34512f4d5cc448306feba6e8415d2f6' + '2f9704ea5ebddeb97d621b0e835d40f5' + 'fb1ad9a9c3f91cf2a183cd78396a8a52' + '7e63462439297ccf08fe711c4b1ab8f7' + 'ba9c7fa1351ddc27d3ecf8b0ac0317fd' + '67e0b46be58197c2675432dfc327d560' + '9befea317886c8b6777dc7effe51cda7' + '9d066ac5142ef185517c0fb9b8653639' + '04d61f96f99ac5598bf8f56d8dc25565' + '3ca63127ca804d5cef480c989989c486' + '7b3395c641f004100f673ca9fee9e01a' + 'cab1ffd94e1e0887512f32b8f6a89887' + 'f527318deb82cbf9fb3de566c4cb88a5' + 'c65be577f5976b8d94ff005afd769675' + 'c892e6a1d6940306da2efc77000f3565' + 'a39a5c5a6b4956c083434b5facb91e64' + 'f9142a79f2e40d07f697b80c3ab6244b' + '7b236f89484517a24cd277c86e329d85' + 'd9cbc3b9740482206df160a3fc51d333' + 'fe0ace74abc26a16828f099d2703df74' + '7af0ddaca259c0e90bf4aa9785a403c3' + '12943583d5dd29e5734dfadad42712a2' + '347a0405128299746c79f8f4257ee703' + 'd45175d7a576f7908e6b5ea17890f092' + '512111f5b2aed403e4e7a35daeea783e' + '5f4c21e170eadd29f1711c69f22d6995' + '68f79a87785a0e0b26820254294e41e8' + 'cc04805eb73090ad59b46420951e2d03' + 'c110f3d89986d0716a986dadfab50ed0' + 'b479fdc0f0dcba24fa5da65bb248d9f8' + '258ab0b9735f7338ea2f5bccd1fe9e86' + 'ea4a58f1e834f1e686bc951a72d62b7b' + 'a452994bcc9e3c149ac62f5b813a4b04' + '44a88442fecdd66aa4e27688694e90a5' + '9964ed78440540aea8075dd5ec9cd955' + '08089bd22ddc2a02d0705e525a7e3ce4' + '565c4bd7d2144c3025c6e308397887a5' + '3e02ba4020729d3b0547644e0eb2dc54' + 'e023a7174d0afb164c804a04e6022668' + '5adc80b8d0ad4bf0d6002ea79302be4b' + '3accbfc1ad590a6081f2f6581869a202' + 'b7a91b4c0f23d5513df928e479378c50' + '2c232c362370da05e2e3350a072f8940' + '8b48ea1894172524cd5d694e29ade465' + '5cfe92492dae4ce1db2452be6b099268' + '3a0039663d383de877dbd6e8195ef541' + '662ad0e593d163c3ec4a7c49acea4afb' + '1da0b621175e529b92d95019aa53d16e' + 'ae58688613d4995fc2d22ebc18f7956d' + 'bce5306add1535f73c18c11500b64135' + '74c333019b4fe6cef566a7550da2f8d9' + '601295f6174dab4fa72b0d01c475eb4b' + 'fce283d1e71e2d39436f52dcf90d819a' + '09bebce9e2e91a5e616395b5f749bc68' + '4d344d72245342e924605d71c0634cd0' + 'fd3d4570ac821c6a2dc8fba33fe6fc7b' + 'cf3c7a447e0de8d159494e6b9628a77c' + 'bc1faf397ea1f1df7da90d1aa461f863' + '720b71f31abca3b6bee49a4847928b4a' + '24381d471e6aece47d8103d60c9150a0' + 'f860e74848e846355328c5f682012d20' + 'cfb201c484f0ce4252e4d8916ed93525' + '30937e171178d3cb5c5d937cf2643a6e' + '18c6551fca608f364bd0c1a95e1be287' + '75b856df4e6215227bc81a892f48554a' + '4ccc85b898e67a9c28046be2a835d2ec' + 'e45227d078f974f3582801bbadadce66' + '4e7b66d513a1bce054ba00fb2c732666' + 'ad0d5baf4019b381acc50edb7e43b829' + '89aa84e229bf3351f8a399ef9d120955' + 'cea0e9aa1ced20ec218d4a1cbf8871e7' + 'b526024f9e67041878f7b239c331d91c' + 'df2ab484ac3732ca672f6c1a0cad4076' + '517593a36f58c2b4de94b95220c66f2e' + 'd817c638053d6e258a3d8ecb3cd2ed32' + 'c502c99f906ac68ec548c135f2b6eb4c' + 'd44b0d8336d5a3f59b21de6a5e7895cb' + '9872e26b032430c413d65d17a06a4fb8' + '93da36366a3677f245b8b0fb802ac9e6' + 'c3e80ca60fdab092681862627d7b41a4' + 'eafb4a3641d098a973f187d30d071805' + '7d14e31cb2dbb5f538829544e008fe91' + '2d2911783bf67c9265057ab29f75180c' + 'fb16c4e3052c7663864f0f8fe957d52c' + '8e3a57aa5cf0cf977658a8de47fa373e') diff --git a/libreoffice/PKGBUILD b/libreoffice/PKGBUILD index 88a9fdfd7..3fd0ad64a 100644 --- a/libreoffice/PKGBUILD +++ b/libreoffice/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('libreoffice-common' 'libreoffice-draw' 'libreoffice-impress' 'libreoffice-gtk3' - 'libreoffice-qt5' + 'libreoffice-kde5' 'libreoffice-math' 'libreoffice-sdk' 'libreoffice-sdk-doc' @@ -14,9 +14,9 @@ pkgname=('libreoffice-common' 'libreoffice-postgresql-connector' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') -_LOver=6.0.4.2 -pkgver=6.0.4 -pkgrel=2 +_LOver=6.0.5.2 +pkgver=6.0.5 +pkgrel=1 arch=('x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -24,9 +24,9 @@ screenshot="http://wstaw.org/m/2012/04/20/libre2.png" makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'gtk3' 'gtk2' 'gobject-introspection' 'apache-ant' 'gperf' 'kdelibs' 'cppunit>=1.14.0' 'glu' 'libodfgen' - 'beanshell' 'qt5-x11extras' 'kcoreaddons' 'ki18n' 'kwindowsystem' 'kconfig' 'kio' - 'libldap' 'libmythes' 'junit' 'libwpg' 'imagemagick' 'mdds' - 'mesa' 'gst-plugins-base' 'java-runtime' 'postgresql-libs' 'clucene' 'doxygen' 'libvisio' 'bluez-libs' 'junit' + 'beanshell' 'kcoreaddons' 'ki18n' 'kwindowsystem' 'kconfig' 'kio' + 'libldap' 'libmythes' 'junit' 'libwpg' 'imagemagick' 'mdds' 'poppler>=0.12.0' + 'mesa' 'gst-plugins-base' 'java-runtime' 'postgresql-libs' 'clucene' 'doxygen' 'libvisio' 'bluez-libs' 'junit' 'hsqldb-java' 'libzmf' # libreoffice main pkg "curl>=7.20.0" "hunspell>=1.2.8" 'python3' 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nss' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' @@ -40,8 +40,8 @@ _mirror="http://download.documentfoundation.org/libreoffice/src/$pkgver" _additional_source_url="http://dev-www.libreoffice.org/src" _additional_source_url2="http://dev-www.libreoffice.org/extern" _gentoo_patch_url="https://dev.gentoo.org/~asturm/distfiles" -source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz -# {,.asc} +source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} + # Environment variables ${_additional_source_url}/boost_1_65_1.tar.bz2 ${_additional_source_url}/xmlsec1-1.2.25.tar.gz ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip @@ -80,22 +80,24 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/libe-book-0.1.3.tar.xz ${_additional_source_url}/libabw-0.1.2.tar.xz ${_additional_source_url}/libpagemaker-0.0.4.tar.xz - ${_additional_source_url}/language-subtag-registry-2017-12-14.tar.bz2 + ${_additional_source_url}/language-subtag-registry-2018-03-30.tar.bz2 ${_additional_source_url}/CoinMP-1.7.6.tgz ${_additional_source_url}/libstaroffice-0.0.5.tar.xz ${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2 ${_additional_source_url}/libgltf/libgltf-0.1.0.tar.gz ${_additional_source_url}/pdfium-3235.tar.bz2 - ${_additional_source_url}/poppler-0.59.0.tar.xz ${_additional_source_url}/libepubgen-0.1.0.tar.bz2 ${_additional_source_url}/libqxp-0.0.1.tar.xz make-pyuno-work-with-system-wide-module-install.diff ${_gentoo_patch_url}/libreoffice-6.0.3.2-patchset-01.tar.xz) -#validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) -md5sums=('35cf97f2a9bd8fc173fc75b05e38bf29' - '0dd519a43ad53d0dbfcabbbebbd9ec2a' - '8677d98f37ea964f9e5bdc7b83e9b9ff' +validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) +md5sums=('04e50cf96598790feada18cbeea7bf1f' + 'SKIP' + '1327c6fd9f65136f905a1b26ba9076b8' + 'SKIP' + '5f77cd5eff3fc5b84b963d760d7af071' + 'SKIP' '41d7542ce40e171f3f7982aff008ff0d' 'dbbef1efc69e61bc4629650205a05b41' '35c94d2df8893241173de1d16b6034c0' @@ -134,14 +136,13 @@ md5sums=('35cf97f2a9bd8fc173fc75b05e38bf29' '2956f1c5e7950b0018979a132165da8b' '201f477df7ea90d362c389c145c0f352' '8395dfc5eef11c58d5a9efe3bfe64831' - 'e22b572f9cf21871b01c0f129bb5e9eb' + 'bc9d10428f8040ff9aa409cf3456a4ce' '1cce53bf4b40ae29790d2c5c9f8b1129' '333d699273f73d582037ba64be9ebcae' '4b87018f7fff1d054939d19920b751a0' '4ca8a6ef0afeefc864e9ef21b9f14bd6' '63ae962d0c436909979826fce0fca2fd' 'a7c08f44c6e2e1d7a71f7073cb9d5786' - '6e44408a3b4f4a738f8a6770d0aea8a5' 'b2df6e241b546265257f0aee1c2a02b8' '778e9ee464b6db3c10f45b7c7d97b22d' '41fa5baa6d71d69b98de1fe258a6dd65' @@ -186,21 +187,19 @@ noextract=( libabw-0.1.2.tar.xz libpagemaker-0.0.4.tar.xz CoinMP-1.7.6.tgz - language-subtag-registry-2017-12-14.tar.bz2 + language-subtag-registry-2018-03-30.tar.bz2 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 OpenCOLLADA-master-6509aa13af.tar.bz2 libgltf-0.1.0.tar.gz libstaroffice-0.0.5.tar.xz pdfium-3235.tar.bz2 - poppler-0.59.0.tar.xz libepubgen-0.1.0.tar.bz2 libqxp-0.0.1.tar.xz) prepare() { cd libreoffice-$_LOver - # Apply a patch to fix vcl error with gtkSalMenu -# patch -Np1 < ../libreoffice-5.4.4.2-gtk3-no-gtk-build.patch + # Apply a patch to enable more VCL plugin for patch in $(ls $srcdir/libreoffice-6.0.3.2-patchset-01/); do patch -Np1 -i $srcdir/libreoffice-6.0.3.2-patchset-01/$patch done @@ -236,6 +235,7 @@ build() { cd libreoffice-$_LOver + export PYHTON=/usr/bin/python3 ./autogen.sh --with-build-version="${pkgver} Chakra GNU/Linux-${pkgrel}" --with-vendor="Chakra GNU/Linux" \ --enable-split-app-modules \ --with-parallelism=${MAKEFLAGS/-j/} \ @@ -312,7 +312,6 @@ build() { --with-alloc=system \ --with-system-clucene \ --without-system-xmlsec \ - --without-system-poppler \ --without-system-libepubgen \ --without-system-libqxp @@ -323,15 +322,15 @@ build() { mkdir $srcdir/fakeinstall make DESTDIR=${srcdir}/fakeinstall distro-pack-install } + package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=${pkgbase}.install - depends=('libreoffice-langpack' "hunspell" "python3" "neon" + depends=("hunspell" "python3" "neon" 'poppler' 'nspr' "icu" 'libsm' 'redland' 'hyphen' 'graphite' 'lcms2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'clucene' 'libodfgen' 'libmwaw' 'lpsolve' 'libmythes' 'libvisio' 'glew' 'harfbuzz-icu') - #'saxon' optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' 'libcups: adds printing support' @@ -346,13 +345,14 @@ package_libreoffice-common() { 'unixodbc: adds ODBC database support' 'gst-plugins-base: + some gstr-plugins to support multimedia content, e.g. in impress' 'libetonyek: Apple Keynote document importer' - 'libreoffice-gtk3: GTK3 integration') + 'libreoffice-desktop-integration: for KDE4/Plasma/GTK3 integration') backup=(etc/libreoffice/sofficerc etc/libreoffice/bootstraprc - etc/libreoffice/psprint.conf) -groups=('libreoffice') + etc/libreoffice/psprint.conf + etc/profile.d/libreoffice.sh) + groups=('libreoffice') -provides=('libreoffice-extension-pdfimport' + provides=('libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' @@ -412,9 +412,9 @@ provides=('libreoffice-extension-pdfimport' package_libreoffice-base() { pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI." - depends=('libreoffice-common' 'libreoffice-kde4') + depends=('libreoffice-common') optdepends=('libreoffice-postgresql-connector' - 'libreoffice-gtk3: GTK3 integration') + 'libreoffice-desktop-integration: for KDE4/Plasma/GTK3 integration') backup=() groups=('libreoffice') replaces=('libreoffice') @@ -459,8 +459,8 @@ package_libreoffice-postgresql-connector() { package_libreoffice-calc() { pkgdesc="Spreadsheet application for LibreOffice." - depends=('libreoffice-common' 'libreoffice-kde4' 'lpsolve' 'libwps' ) - optdepends=('libreoffice-gtk3: GTK3 integration') + depends=('libreoffice-common' 'lpsolve' 'libwps' ) + optdepends=('libreoffice-desktop-integration: for KDE4/Plasma/GTK3 integration') backup=() groups=('libreoffice') replaces=('libreoffice') @@ -481,8 +481,8 @@ package_libreoffice-calc() { package_libreoffice-draw() { pkgdesc="Drawing Application for LibreOffice." - depends=('libreoffice-common' 'libreoffice-kde4') - optdepends=('libreoffice-gtk3: GTK3 integration') + depends=('libreoffice-common') + optdepends=('libreoffice-desktop-integration: better desktop environment integration') backup=() groups=('libreoffice') replaces=('libreoffice') @@ -503,9 +503,9 @@ package_libreoffice-draw() { package_libreoffice-impress() { pkgdesc="Presentation Application for LibreOffice." - depends=('libreoffice-common' 'libreoffice-kde4') + depends=('libreoffice-common') optdepends=('mesa: for the OGLTrans extension' - 'libreoffice-gtk3: GTK3 integration') + 'libreoffice-desktop-integration: better desktop environment integration') backup=() groups=('libreoffice') replaces=('libreoffice') @@ -524,11 +524,11 @@ package_libreoffice-impress() { done } -package_libreoffice-qt5() { - pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." - depends=('libreoffice-common' 'kdelibs') - optdepends=() - backup=() +package_libreoffice-kde5() { + pkgdesc="Plug-in for LibreOffice that enables integration into Plasma desktop environment." + depends=('kcoreaddons' 'kio' 'kwindowsystem' 'kconfig' 'ki18n' 'gtk3') + provides=(libreoffice-desktop-integration) + replaces=('libreoffice-qt5' "libreoffice-kde4<=$pkgver") groups=('libreoffice') # Merge kde and kde4 filelists as we do not bother with compat anymore @@ -551,9 +551,8 @@ package_libreoffice-qt5() { package_libreoffice-gtk3() { pkgdesc="Plug-in for LibreOffice that enables GTK3 engine." - depends=('libreoffice-common' 'gtk3') - optdepends=() - backup=() + depends=('gtk3') + provides=(libreoffice-desktop-integration) groups=('libreoffice') # create directories from *list.txt file @@ -573,8 +572,8 @@ package_libreoffice-gtk3() { package_libreoffice-math() { pkgdesc="Equation Editor Application for LibreOffice." - depends=('libreoffice-common' 'libreoffice-kde4') - optdepends=('libreoffice-gtk3: GTK3 integration') + depends=('libreoffice-common') + optdepends=('libreoffice-desktop-integration: better desktop environment integration') backup=() groups=('libreoffice') replaces=('libreoffice') @@ -595,8 +594,7 @@ package_libreoffice-math() { package_libreoffice-sdk() { pkgdesc="Software Development Kit for LibreOffice." - depends=('libreoffice-common' 'libreoffice-kde4' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') - optdepends=('libreoffice-gtk3: GTK3 integration') + depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') backup=() groups=('libreoffice') @@ -640,9 +638,9 @@ package_libreoffice-sdk-doc() { package_libreoffice-writer() { pkgdesc="Word Processor Applicationfor LibreOffice." - depends=('libreoffice-common' 'libreoffice-base' 'libreoffice-kde4' 'libwpd' 'libwps' 'libxml2') + depends=('libreoffice-common' 'libwpd' 'libwps' 'libxml2') optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images' - 'libreoffice-gtk3: GTK3 integration') + 'libreoffice-desktop-integration: better desktop environment integration') backup=() groups=('libreoffice') replaces=('libreoffice') diff --git a/libreoffice/libreoffice.install b/libreoffice/libreoffice.install index 1ef851fae..bbd31e03a 100644 --- a/libreoffice/libreoffice.install +++ b/libreoffice/libreoffice.install @@ -1,21 +1,7 @@ post_install() { -update-mime-database usr/share/mime > /dev/null 2>&1 -kbuildsycoca4 --noincremental &> /dev/null - echo " * You may want to pacman -Ss libreoffice-extensions" echo " to see what extensions are prepared to install" echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg for spell checking" echo " * make sure you have installed some ttf fonts (ttf-dejavu recommended)" } - -post_upgrade() { -# post_install $1 -update-mime-database usr/share/mime > /dev/null 2>&1 -kbuildsycoca4 --noincremental &> /dev/null -} - -post_remove() { -update-mime-database usr/share/mime > /dev/null 2>&1 -kbuildsycoca4 --noincremental &> /dev/null -} diff --git a/libreoffice/libreoffice.sh b/libreoffice/libreoffice.sh new file mode 100644 index 000000000..1610ba146 --- /dev/null +++ b/libreoffice/libreoffice.sh @@ -0,0 +1,7 @@ +# to force a certain look'n feel + +#export SAL_USE_VCLPLUGIN=gen +#export SAL_USE_VCLPLUGIN=kde4 +#export SAL_USE_VCLPLUGIN=gtk +#export SAL_USE_VCLPLUGIN=gtk3 +#export SAL_USE_VCLPLUGIN=gtk3-kde5 diff --git a/med/PKGBUILD b/med/PKGBUILD new file mode 100644 index 000000000..4e64e3a44 --- /dev/null +++ b/med/PKGBUILD @@ -0,0 +1,63 @@ +# Contributor: Oliver Goethel + +pkgname=med +pkgver=3.2.0 +pkgrel=1 +pkgdesc="MED stands for Modelisation et Echanges de Donnees, i.e. Data Modelization and Exchanges - MED is code-aster exchange module linked to hdf5" +url="http://www.code-aster.org/outils/med/" +license=('LGPL') +depends=('hdf5' 'openmpi' 'swig') +makedepends=('gcc-fortran' 'coreutils' 'python2') +optdepends=('tk') +provides=() +conflicts=('med_fichier') +replaces=('med_fichier') +backup=() +arch=('x86_64') +source=("http://files.salome-platform.org/Salome/other/${pkgname}-${pkgver}.tar.gz" + "patch-include_2.3.6_med.h.in" + "patch-include_med.h.in" + "patch-src_2.3.6_ci_MEDequivInfo.c" + "patch-int2long") +md5sums=('eb61df92f0624feb6328f517cd756a23' + 'b83949326d7ae0ca77a06822b754a329' + '14a151cea108388d7a3b4c62887169f6' + '8f0cbf6f08783a6ba68ff5ab240dd62e' + 'be65d145b85ed5b19a709d9dee84b6d2') + +build() { + export FFLAGS="-fopenmp -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 -ffixed-line-length-0 ${CFLAGS}" + export FCFLAGS="-fopenmp -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 -ffixed-line-length-0 ${CFLAGS}" + export CPPFLAGS="-DHAVE_F77INT64 ${CPPFLAGS}" + export F77=mpif90 + export FC=mpif90 + + export PYTHON="$(which python2)" + + cd ${srcdir}/${pkgname}-${pkgver} || return 1 + + # patch H5public_extract.h.in + sed -i -e '/^#typedef/ s/#/\/\//' ./include/H5public_extract.h.in + + #patch for hdf5-1.10 + patch -p0 < ${srcdir}/patch-include_2.3.6_med.h.in + patch -p0 < ${srcdir}/patch-include_med.h.in + patch -p0 < ${srcdir}/patch-src_2.3.6_ci_MEDequivInfo.c + patch -p0 < ${srcdir}/patch-int2long + + ./configure --with-f90=mpif90 --prefix=/usr --datadir=/usr/share/med --with-swig=yes || return 1 + make || return 1 +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} || return 1 + + make DESTDIR=${pkgdir} install || return 1 + # now move the testprograms to share, we don't want all the stuff in the bindir + cp -dpr --no-preserve=ownership ${pkgdir}/usr/bin/testc ${pkgdir}/usr/share/med/testc + cp -dpr --no-preserve=ownership ${pkgdir}/usr/bin/testf ${pkgdir}/usr/share/med/ + cp -dpr --no-preserve=ownership ${pkgdir}/usr/bin/unittests ${pkgdir}/usr/share/med/ + cp -dpr --no-preserve=ownership ${pkgdir}/usr/bin/usescases ${pkgdir}/usr/share/med/ + rm -r ${pkgdir}/usr/bin/{usescases,unittests,testf,testc} +} + diff --git a/med/patch-include_2.3.6_med.h.in b/med/patch-include_2.3.6_med.h.in new file mode 100644 index 000000000..2602df9f7 --- /dev/null +++ b/med/patch-include_2.3.6_med.h.in @@ -0,0 +1,14 @@ +--- include/2.3.6/med.h.in.orig 2014-10-09 08:12:57 UTC ++++ include/2.3.6/med.h.in +@@ -25,11 +25,7 @@ extern "C" { + #endif + + #define HDF5_VERSION (H5_VERS_MAJOR * 10000 + H5_VERS_MINOR * 100 + H5_VERS_RELEASE ) +-#if HDF5_VERSION < 10607 +-#define HDF5_SELECT_BUG (const hsize_t **) +-#else + #define HDF5_SELECT_BUG +-#endif + + + #define MED_NUM_MAJEUR 2 diff --git a/med/patch-include_med.h.in b/med/patch-include_med.h.in new file mode 100644 index 000000000..c47a57c26 --- /dev/null +++ b/med/patch-include_med.h.in @@ -0,0 +1,15 @@ +--- include/med.h.in.orig 2014-10-09 08:12:57 UTC ++++ include/med.h.in +@@ -27,12 +27,7 @@ extern "C" { + + #define HDF5_VERSION (H5_VERS_MAJOR * 10000 + H5_VERS_MINOR * 100 + H5_VERS_RELEASE ) + +-#if HDF5_VERSION < 10607 +-/*TODO : A enlever après MAJ complète api hdf5-1.8 */ +-#define HDF5_SELECT_BUG (const hsize_t **) +-#else + #define HDF5_SELECT_BUG +-#endif + + /*Le symbole H5F_LIBVER_18 n'existe pas dans hdf5-1.8.4 (uniquement à partir de la version 1.8.6) + Pour rester dans le modèle interne hdf introduit en 1.8 quelque soit les futurs modèles internes hdf diff --git a/med/patch-int2long b/med/patch-int2long new file mode 100644 index 000000000..c7f9dccb0 --- /dev/null +++ b/med/patch-int2long @@ -0,0 +1,108 @@ +diff -Nur src.orig/2.3.6/hdfi/MEDattrNumEcrire.c src/2.3.6/hdfi/MEDattrNumEcrire.c +--- src.orig/2.3.6/hdfi/MEDattrNumEcrire.c 2015-09-07 18:55:34.000000000 +0200 ++++ src/2.3.6/hdfi/MEDattrNumEcrire.c 2016-05-24 02:15:27.450098778 +0200 +@@ -36,7 +36,7 @@ + { + med_idt aid,attr; + med_err ret; +- int type_hdf; ++ long type_hdf; + med_mode_acces MED_MODE_ACCES; + + if ( (MED_MODE_ACCES = _MEDmodeAcces(pere) ) == MED_UNDEF_MODE_ACCES ) { +diff -Nur src.orig/hdfi/_MEDattributeNumRdByName.c src/hdfi/_MEDattributeNumRdByName.c +--- src.orig/hdfi/_MEDattributeNumRdByName.c 2015-09-07 18:55:16.000000000 +0200 ++++ src/hdfi/_MEDattributeNumRdByName.c 2016-05-24 02:15:27.443432111 +0200 +@@ -27,7 +27,7 @@ + { + med_idt _attid=0; + med_err _ret=-1; +- int type_hdf; ++ long type_hdf; + + switch(type) + { +diff -Nur src.orig/hdfi/_MEDattributeNumWrByName.c src/hdfi/_MEDattributeNumWrByName.c +--- src.orig/hdfi/_MEDattributeNumWrByName.c 2015-09-07 18:55:17.000000000 +0200 ++++ src/hdfi/_MEDattributeNumWrByName.c 2016-05-24 02:15:27.443432111 +0200 +@@ -32,7 +32,7 @@ + { + med_idt _attid=0,aid=0; + med_err _ret=-1; +- int type_hdf; ++ long type_hdf; + med_access_mode MED_ACCESS_MODE; + H5O_info_t _oinfo; + +diff -Nur src.orig/hdfi/_MEDattributeNumWr.c src/hdfi/_MEDattributeNumWr.c +--- src.orig/hdfi/_MEDattributeNumWr.c 2015-09-07 18:55:16.000000000 +0200 ++++ src/hdfi/_MEDattributeNumWr.c 2016-05-24 02:15:27.443432111 +0200 +@@ -32,7 +32,7 @@ + { + med_idt _attid=0,aid=0; + med_err _ret=-1; +- int type_hdf; ++ long type_hdf; + med_access_mode MED_ACCESS_MODE; + H5O_info_t _oinfo; + +diff -Nur src.orig/hdfi/_MEDattributeStringRdByName.c src/hdfi/_MEDattributeStringRdByName.c +--- src.orig/hdfi/_MEDattributeStringRdByName.c 2015-09-07 18:55:15.000000000 +0200 ++++ src/hdfi/_MEDattributeStringRdByName.c 2016-05-24 02:15:27.443432111 +0200 +@@ -29,7 +29,7 @@ + { + med_err _ret=-1; + med_idt _attid=0; +- int type_hdf=0; ++ long type_hdf=0; + + if ( (type_hdf = H5Tcopy(H5T_C_S1)) < 0) { + MED_ERR_(_ret,MED_ERR_CREATE,MED_ERR_HDFTYPE, MED_ERR_NAME_MSG ); +diff -Nur src.orig/hdfi/_MEDattributeStringWrByName.c src/hdfi/_MEDattributeStringWrByName.c +--- src.orig/hdfi/_MEDattributeStringWrByName.c 2015-09-07 18:55:16.000000000 +0200 ++++ src/hdfi/_MEDattributeStringWrByName.c 2016-05-24 02:15:27.443432111 +0200 +@@ -31,7 +31,7 @@ + med_access_mode MED_ACCESS_MODE; + med_idt _attid=0,aid=0; + med_err _ret=-1; +- int type_hdf=0; ++ long type_hdf=0; + med_bool _attmustbecreated= MED_FALSE; + hsize_t _attsize=0; + med_size _valsize=0; +diff -Nur src.orig/hdfi/_MEDattributeStringWr.c src/hdfi/_MEDattributeStringWr.c +--- src.orig/hdfi/_MEDattributeStringWr.c 2015-09-07 18:55:17.000000000 +0200 ++++ src/hdfi/_MEDattributeStringWr.c 2016-05-24 02:15:27.443432111 +0200 +@@ -30,7 +30,7 @@ + med_access_mode MED_ACCESS_MODE; + med_idt _attid=0,aid=0; + med_err _ret=-1; +- int type_hdf=0; ++ long type_hdf=0; + med_bool _attmustbecreated= MED_FALSE; + hsize_t _attsize=0; + med_size _valsize=0; +diff -Nur src.orig/hdfi/_MEDdatasetRd.c src/hdfi/_MEDdatasetRd.c +--- src.orig/hdfi/_MEDdatasetRd.c 2015-09-07 18:55:15.000000000 +0200 ++++ src/hdfi/_MEDdatasetRd.c 2016-05-24 02:15:27.443432111 +0200 +@@ -32,7 +32,7 @@ + med_idt _dataset=0, _dataspace=0; + med_size _datasetsize[1]={0}; + med_err _ret=-1; +- int _hdftype=0; ++ long _hdftype=0; + int _datasetsizeEqualTosizespace = 0; + med_access_mode _MED_ACCESS_MODE; + med_int _nvaluesperentity=0,_nconstituentpervalue=0; +diff -Nur src.orig/hdfi/_MEDdatasetWr.c src/hdfi/_MEDdatasetWr.c +--- src.orig/hdfi/_MEDdatasetWr.c 2015-09-07 18:55:15.000000000 +0200 ++++ src/hdfi/_MEDdatasetWr.c 2016-05-24 02:15:27.443432111 +0200 +@@ -30,7 +30,7 @@ + med_idt _dataset=0, _dataspace=0,_datadiskspace=0; + med_size _datasetsize[1]={0}; + med_err _ret=-1; +- int _hdftype=0; ++ long _hdftype=0; + int _datasetsizeEqualTosizespace = 0; + med_access_mode _MED_ACCESS_MODE; + med_int _nvaluesperentity=0,_nconstituentpervalue=0; \ No newline at end of file diff --git a/med/patch-src_2.3.6_ci_MEDequivInfo.c b/med/patch-src_2.3.6_ci_MEDequivInfo.c new file mode 100644 index 000000000..12006a1f3 --- /dev/null +++ b/med/patch-src_2.3.6_ci_MEDequivInfo.c @@ -0,0 +1,11 @@ +--- src/2.3.6/ci/MEDequivInfo.c.orig 2014-10-09 08:12:59 UTC ++++ src/2.3.6/ci/MEDequivInfo.c +@@ -24,7 +24,7 @@ + #include + + int +-MEDequivInfo(int fid, char *maa, int ind, char *eq, char *des) ++MEDequivInfo(med_idt fid, char *maa, int ind, char *eq, char *des) + { + med_idt eqid; + med_err ret; diff --git a/mendeleydesktop/PKGBUILD b/mendeleydesktop/PKGBUILD index 3c026c6de..689b8cf89 100644 --- a/mendeleydesktop/PKGBUILD +++ b/mendeleydesktop/PKGBUILD @@ -1,108 +1,62 @@ + pkgname=mendeleydesktop -pkgver=1.17.9 +pkgver=1.19.1 pkgrel=1 pkgdesc="Academic software for managing and sharing research papers (desktop client)" url=http://www.mendeley.com/release-notes/ -arch=('x86_64') -depends=('python2' 'qtwebkit') -license=('custom:mendeley_eula') -install=mendeleydesktop.install -categories=('education') -screenshot=('http://www.timelordz.com/blog/wp-content/uploads/2010/08/MendeleyClient.png') -source=("http://download.mendeley.com/linux/$pkgname-$pkgver-linux-x86_64.tar.bz2") -sha1sums=('d351813299b126009f4ab21ae3b7dcda3c261cae') +arch=(x86_64) +depends=(qt5-webengine) +license=(custom:mendeley_eula) +source=("https://desktop-download.mendeley.com/download/linux/$pkgname-$pkgver-linux-x86_64.tar.bz2") +sha512sums=('fd9ecc4d907c267a0416b472931e08179cfd385a37573b6601227c1760cde935280517aea617e31910dbf029ade7dd78cf5a48236df94ce52b2030a0edb7ba11') prepare() { - cd "${srcdir}/$pkgname-$pkgver-linux-x86_64" + cd "$pkgname-$pkgver-linux-$CARCH" + # Using shared libraries so remove the bundled ones + rm -rf lib/cpp lib/qt lib/ssl lib/libpng12.so.0 lib/mendeleydesktop/plugins + rm -rf lib/mendeleydesktop/libexec/resources + rm -rf lib/mendeleydesktop/libexec/translations/qtwebengine_locales - sed -i '1s@^#!/usr/bin/python$@&2@' bin/mendeleydesktop - - # remember, if you upgrade from 1.13.6 or older, - # remove any old versions of ".desktop" file of mendeley in ~/.local/share/applications/ - # stop the creations of .desktop file of mendeley in ~/.local/share/applications/ - echo '#!/bin/sh - -DESKTOP_PATH=$HOME/.local/share/applications/ -DESKTOP_FILE=$DESKTOP_PATH/mendeleydesktop.desktop -MENDELEYDESKTOP_BIN=$HOME/.local/share/mendeleydesktop -GCONF_TOOL=`which gconftool-2` - -if [ $? -ne 0 ]; then - echo "Unable to find gconftool-2. The mendeley:// link handler may not be installed correctly." >&2 -fi -if [ ! -d "$DESKTOP_PATH" ]; then - mkdir -p "$DESKTOP_PATH" -fi - -while getopts "u" flag -do - case $flag in - u) - # Uninstall the link handler - rm -f $DESKTOP_FILE - $GCONF_TOOL -u /desktop/gnome/url-handlers/mendeley - - exit 0 - ;; - \?) - echo "Unknown option: -$OPTARG" >&2 - ;; - esac -done - -shift $(($OPTIND - 1)) -if [ $# -ne 1 ]; then - echo "Usage: "`basename $0`" [options] " - echo " -u : Uninstall the mendeley:// link handler" - echo "" - echo "Install the mendeley:// link handler to launch " - echo "" - exit 1 -fi - -if [ ! -f "$1" ]; then - echo "Mendeley Desktop binary '$1' does not exist" - exit 1 -fi - -# install the gnome link handler -$GCONF_TOOL -s /desktop/gnome/url-handlers/mendeley/command "$MENDELEYDESKTOP_BIN %s" --type String -$GCONF_TOOL -s /desktop/gnome/url-handlers/mendeley/enabled --type Boolean true' > bin/install-mendeley-link-handler.sh - - #Remove unneeded lines if gconf is not installed. - if ! which gconftool-2 &>/dev/null;then - sed -i '6d;74d;75d' \ - bin/install-mendeley-link-handler.sh - fi + # TODO Run install-mendeley-link-handler.sh for gconf or just remove it? + rm bin/install-mendeley-link-handler.sh + # # Remove unneeded lines if gconf is not installed. + # if ! which gconftool-2 &>/dev/null;then + # sed -i '/GCONF/d' \ + # "$pkgdir"/opt/"$pkgname"/bin/install-mendeley-link-handler.sh + # fi } package() { - cd "$pkgname-$pkgver-linux-x86_64" - - install -d ${pkgdir}/usr/{bin,lib,share} - - cp -R bin ${pkgdir}/usr - - # remove bundled Qt from package - rm -rf lib/qt - cp -R lib ${pkgdir}/usr + cd "$pkgname-$pkgver-linux-$CARCH" - # remove qt.conf to avoid Qt plugins fail to load - rm -f ${pkgdir}/usr/bin/qt.conf - - install -D share/applications/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop - install -D share/doc/${pkgname}/License.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - - install -d ${pkgdir}/usr/share/{icons,mendeleydesktop} - cp -R share/icons ${pkgdir}/usr/share - cp -R share/mendeleydesktop ${pkgdir}/usr/share + # Link system Qt + ln -s /usr/share/qt/resources \ + lib/mendeleydesktop/libexec/ + ln -s /usr/share/qt/translations/qtwebengine_locales \ + lib/mendeleydesktop/libexec/translations/ - #Remove bundled Qt from package - cat << __EOF__ -Removing bundled Qt library. -If you used "--force-bundled-qt" to start mendeley, -make sure you remove any old versions of ".desktop" file of mendeley in ~/.local/share/applications/, -because mendeley will automatically create one there. This will apply only to version 1.13.6 or older. -__EOF__ + install -d "$pkgdir/opt/$pkgname/" + cp -a bin lib share "$pkgdir/opt/$pkgname/" + + # Replace default python laucher with custom bash +cat <<'EOF' > "$pkgdir/opt/$pkgname/bin/mendeleydesktop" +#!/bin/bash +export LD_LIBRARY_PATH=/usr/lib/:/opt/mendeleydesktop/lib/:/usr/lib/qt/ +export MENDELEY_BUNDLED_QT_PLUGIN_PATH=/lib/qt/plugins/ +/opt/mendeleydesktop/lib/mendeleydesktop/libexec/mendeleydesktop.x86_64 "$@" +EOF + + install -d "$pkgdir"/usr/bin + ln -s "/opt/$pkgname/bin/mendeleydesktop" \ + "$pkgdir/usr/bin/mendeleydesktop" + + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 share/applications/mendeleydesktop.desktop \ + "$pkgdir"/usr/share/applications/mendeleydesktop.desktop + + cp -a "$pkgdir/opt/$pkgname/share/icons" "$pkgdir/usr/share/icons" + + # Clean share from opt (don't remove mendeleydesktop) + rm -rf "$pkgdir/opt/$pkgname/share/"{applications,doc,icons} } diff --git a/musescore/PKGBUILD b/musescore/PKGBUILD index 23f36bc5b..e50e236f2 100644 --- a/musescore/PKGBUILD +++ b/musescore/PKGBUILD @@ -1,20 +1,27 @@ pkgname=musescore _pkgname=MuseScore -pkgver=2.1.0 -pkgrel=1 +pkgver=2.2.1 +pkgrel=2 pkgdesc="A music score editor written in Qt" arch=('x86_64') url="http://www.musescore.org/en/" license=('GPL') -depends=('libpulse' 'portaudio' 'qt5-quickcontrols' 'qt5-svg' 'qt5-tools' 'qt5-webkit') +depends=('libpulse' 'portaudio' 'qt5-quickcontrols' 'qt5-svg' 'qt5-tools' 'qt5-webkit' 'portmidi') makedepends=('cmake' 'doxygen' 'lame' 'qt5-script' 'texlive-core') optdepends=('lame: MP3 export') categories=('multimedia') install=musescore.install source=("$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$_pkgname/archive/v$pkgver.tar.gz" - 'musescore.conf') -sha256sums=('0581b8dd4e9bef51f863baf5b7f03b518f9784c79c0d92d6f0e33b180dd63c47' - '397b5431137d468a64b768670efdf385c27cb7298ee9295a32323a2610427928') + 'musescore.conf' + 'qt511.patch') +sha256sums=('261a39e34ee314780f75259ec2971acf69b5f4a2e0b2eb190acdb7fbbd4a89d6' + '397b5431137d468a64b768670efdf385c27cb7298ee9295a32323a2610427928' + '4f3eff67731af1ba05fb29c56ba70a8e244f365c2e6f71f169a6787a8e63a812') + +prepare() { + # Fix Qt 5.11 build - taken from https://github.com/musescore/MuseScore/commit/d10e70415c8e52e2ba9d45de564467e42f66c102#diff-b7ba372d02405ba296d1238b72a5b70c + patch -i qt511.patch +} build() { cd $_pkgname-$pkgver diff --git a/musescore/qt511.patch b/musescore/qt511.patch new file mode 100644 index 000000000..ea1556b32 --- /dev/null +++ b/musescore/qt511.patch @@ -0,0 +1,10 @@ +--- a/MuseScore-2.2.1/all.h 2018-04-03 14:22:48.000000000 +0100 ++++ b/MuseScore-2.2.1/all.h 2018-06-27 09:34:56.542724682 +0100 +@@ -113,6 +113,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/qgit/PKGBUILD b/qgit/PKGBUILD index 537202d37..0ea0c2043 100644 --- a/qgit/PKGBUILD +++ b/qgit/PKGBUILD @@ -1,29 +1,24 @@ pkgname=qgit -pkgver=2.7 +pkgver=2.8 pkgrel=1 pkgdesc="A GIT GUI viewer built on Qt/C++" -url='http://libre.tibirna.org/projects/qgit/wiki/QGit' +url='https://github.com/tibirna/qgit' arch=('x86_64') license=('GPL') -depends=('qt5-base' 'git') +depends=('qt5-base' 'git' 'hicolor-icon-theme') +makedepends=('cmake') categories=('programming') -options=(!makeflags !ccache) #makepkg3 options, ccache is a no-go -source=("${pkgname}::git://repo.or.cz/qgit4/redivivus.git#tag=${pkgname}-${pkgver}" - 'qgit.desktop' 'qgit.svg') - -sha256sums=('SKIP' - '9be6531c6199e80e95ec918f09e734c3d9a400836462f28588aa08e5374791c5' - '9001a5dd9ce4de588b64eccb65d6da5fbda6927f152781bc11b5ed77139db4d5') +source=("${pkgname}::git+https://github.com/tibirna/qgit.git#tag=${pkgname}-${pkgver}") +sha256sums=('SKIP') build() { - cd "${srcdir}/${pkgname}" - qmake-qt5 qgit.pro - make || return 1 + cd ${srcdir}/${pkgname} + rm -rf build && mkdir build && cd build + cmake -DCMAKE_INSTALL_PREFIX="/usr" .. + make } package() { - cd "${srcdir}/${pkgname}" - install -Dm755 bin/qgit ${pkgdir}/usr/bin/qgit || return 1 - install -Dm644 ${srcdir}/qgit.desktop ${pkgdir}/usr/share/applications/qgit.desktop || return 1 - install -Dm644 ${srcdir}/qgit.svg ${pkgdir}/usr/share/pixmaps/qgit.svg || return 1 + cd ${srcdir}/${pkgname}/build + make DESTDIR=${pkgdir} install } diff --git a/qownnotes/PKGBUILD b/qownnotes/PKGBUILD index d845c1dac..8b2bb58c5 100644 --- a/qownnotes/PKGBUILD +++ b/qownnotes/PKGBUILD @@ -1,5 +1,5 @@ pkgname=qownnotes -pkgver=18.04.3 +pkgver=18.06.6 pkgrel=1 pkgdesc="Open source notepad and todo list manager with markdown support and ownCloud integration" arch=('x86_64') @@ -8,7 +8,7 @@ license=('GPL2') depends=('qt5-base' 'qt5-svg' 'qt5-declarative' 'openssl') makedepends=('qt5-tools') source=("http://downloads.sourceforge.net/project/$pkgname/src/$pkgname-$pkgver.tar.xz") -sha256sums=('bb1b798f388196c37a8a33df68652b879b99cc98b8ca96a31d075e6a47f10040') +sha256sums=('08d6f55f0808763aa9f133f58c1954bfc4f321db9e2d8928dbf9ff627e30725f') build() { cd $pkgname-$pkgver diff --git a/quazip/PKGBUILD b/quazip/PKGBUILD index 928e3ea1e..b98786447 100644 --- a/quazip/PKGBUILD +++ b/quazip/PKGBUILD @@ -1,8 +1,8 @@ pkgname=quazip -pkgver=0.7.3 +pkgver=0.7.6 pkgrel=1 pkgdesc="C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package" -url="http://sourceforge.net/projects/quazip/" +url="https://stachenov.github.io/quazip/" license=('LGPL') arch=('x86_64') depends=('qt5-base') @@ -10,12 +10,20 @@ makedepends=('cmake') replaces=('quazip-qt4') provides=('quazip-qt4') conflicts=('quazip-qt4') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -sha1sums=('ed35d6a53d1ac78860bc058241e3e042c7cdb2ff') +source=($pkgname-$pkgver.tar.gz::https://github.com/stachenov/$pkgname/archive/$pkgver.tar.gz) +sha256sums=('4118a830a375a81211956611cc34b1b5b4ddc108c126287b91b40c2493046b70') + +prepare() { + # Fix cmake module install dir + sed -e 's|${CMAKE_ROOT}/Modules|${CMAKE_INSTALL_PREFIX}/lib/cmake/QuaZip|' -i $pkgname-$pkgver/CMakeLists.txt +} build() { - cd $pkgbase-$pkgver - cmake \ + cd "${srcdir}" + + install -d build + cd build + cmake ../$pkgname-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_WITH_QT4:BOOL=OFF \ -DCMAKE_CXX_FLAGS="$CFLAGS -fPIC" @@ -23,6 +31,8 @@ build() { } package() { - cd $pkgbase-$pkgver + cd "${srcdir}" + + cd build make DESTDIR="$pkgdir" install } diff --git a/rrdtool/PKGBUILD b/rrdtool/PKGBUILD index ce2ab3ecd..25ea4feb1 100644 --- a/rrdtool/PKGBUILD +++ b/rrdtool/PKGBUILD @@ -1,26 +1,25 @@ # Contributors from Arch: Eric Belanger -# Tom K pkgname=rrdtool -pkgver=1.6.0 -pkgrel=3 +pkgver=1.7.0 +pkgrel=1 pkgdesc="Data logging and graphing application" arch=('x86_64') -url="http://www.rrdtool.org" -license=('GPL') -depends=('libpng' 'libxml2' 'pango') -makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua' 'groff') +url="https://oss.oetiker.ch/rrdtool/" +license=('GPL' 'custom') +depends=('libpng' 'libxml2' 'pango' 'ttf-dejavu') +makedepends=('intltool' 'ruby' 'python2' 'python2-setuptools' 'tcl' 'lua51' 'groff') optdepends=('tcl: to use corresponding binding' \ 'python2: to use corresponding binding' \ 'ruby: to use corresponding binding' \ - 'lua: to use corresponding binding') -options=('!makeflags') -source=("http://oss.oetiker.ch/rrdtool/pub/${pkgname}-${pkgver}.tar.gz") -sha1sums=('9866b41bda9416188f236d61d24f185b173fd571') + 'lua51: to use corresponding binding') +options=('!emptydirs' '!makeflags') +source=("https://oss.oetiker.ch/${pkgname}/pub/${pkgname}-${pkgver}.tar.gz") +sha1sums=('15a2009e2ee67eb41a2598d1a0f1f7cf1a651c78') prepare() { cd ${pkgname}-${pkgver} - # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby + # fix Arch's FS#28521 make ruby install to vendor_ruby instead of site_ruby sed -e 's/$(RUBY) ${abs_srcdir}\/ruby\/extconf.rb/& --vendor/' -i bindings/Makefile.am aclocal automake @@ -28,11 +27,12 @@ prepare() { build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ + PYTHON=python2 LUA=/usr/bin/lua5.1 \ + LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \ + ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \ --enable-ruby --enable-ruby-site-install --enable-python \ - --enable-lua --enable-lua-site-install \ - --enable-tcl --disable-libwrap + --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap make LIBS+="-lglib-2.0" } diff --git a/semantik/PKGBUILD b/semantik/PKGBUILD index ece4497e4..aa32975a9 100644 --- a/semantik/PKGBUILD +++ b/semantik/PKGBUILD @@ -1,6 +1,6 @@ pkgname=semantik -pkgver=1.0.3 -pkgrel=1 +pkgver=1.0.4 +pkgrel=2 pkgdesc="A mind-mapping tool that helps creating documents such as reports or presentions." arch=('x86_64') url="https://waf.io/semantik.html" @@ -8,7 +8,7 @@ license=('GPL') depends=('kde-runtime' 'python3' 'qt5-base' 'qt5-multimedia' 'qt5-declarative' 'qt5-svg' 'qt5-webengine' 'qt5-tools' 'qt5-3d' 'kdelibs4support' 'kio' 'kiconthemes') screenshot=('https://waf.io/semantik_pics/s1.png') source=("https://waf.io/$pkgname-$pkgver.tar.bz2") -sha1sums=('d3e067d673e2e0fb3e615784d5be8f8e4b793390') +sha1sums=('803d550acbce988001fc94ef3a1eef53f010445a') build() { cd $pkgname-$pkgver diff --git a/skrooge/PKGBUILD b/skrooge/PKGBUILD index 85d230882..5607374a0 100644 --- a/skrooge/PKGBUILD +++ b/skrooge/PKGBUILD @@ -1,9 +1,9 @@ pkgname=skrooge -pkgver=2.13.0 -pkgrel=2 +pkgver=2.14.0 +pkgrel=1 pkgdesc="Allows you to manage your personal finances in KDE" arch=('x86_64') -url="http://skrooge.org" +url="https://skrooge.org" license=('GPL') depends=('qt5-base' 'qca-qt5' 'qt5-script' 'libofx>=0.9.10' 'grantlee' 'kross' 'krunner' 'knotifyconfig' 'sqlcipher' @@ -16,7 +16,7 @@ options=('!emptydirs') categories=('office') install=$pkgname.install source=("https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) -sha256sums=('ed68bd9b4561c2049f3bbfc2abb6b835cbe05a46b1fbd1bd0c5547e8a60333b8' +sha256sums=('b259153f76eeb375a15700939130b967b7414c6b711dde536abacc67114edec6' 'SKIP') validpgpkeys=('103DC6D087B3A4A2ED975D7EF0C8CED3382A5C4D') #Stephane MANKOWSKI (Perso) diff --git a/sword/PKGBUILD b/sword/PKGBUILD index b35316377..062d3b629 100644 --- a/sword/PKGBUILD +++ b/sword/PKGBUILD @@ -1,30 +1,57 @@ # Maintainer: Francesco Marinucci -pkgname=sword -pkgver=1.7.4 -mainver=1.7 -pkgrel=2 -pkgdesc="SWORD libraries for Bible programs" +pkgbase=sword +pkgname=(sword python-sword python2-sword) +_mainver=1.8 +pkgver=1.8.1 +pkgrel=1 +pkgdesc="Library for Bible study programs" arch=('x86_64') -url="http://www.crosswire.org/sword/index.jsp" +url="http://www.crosswire.org/sword/" license=('GPL') -depends=('icu' 'curl' 'clucene' 'swig') -makedepends=('cmake') -backup=('etc/sword.conf') -source=("http://www.crosswire.org/ftpmirror/pub/$pkgname/source/v$mainver/$pkgname-$pkgver.tar.gz") -md5sums=('1677f02a86cbf07713d4e1d4c39791e6') +makedepends=('curl' 'clucene' 'swig' 'cmake' 'python3' 'python2') +source=("http://www.crosswire.org/ftpmirror/pub/$pkgbase/source/v$_mainver/$pkgbase-$pkgver.tar.gz") +sha512sums=('5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36') + +prepare() { + cd "$srcdir/$pkgbase-$pkgver" + mkdir build +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgbase-$pkgver/build" - ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc + # http://site.icu-project.org/download/61#TOC-Migration-Issues + CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1' + + #./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc + cmake .. -DLIBSWORD_LIBRARY_TYPE="Shared" -DSYSCONF_INSTALL_DIR='/etc' \ + -DSWORD_BUILD_TESTS="Yes" -DSWORD_BINDINGS="Python" -DCMAKE_INSTALL_PREFIX=/usr make + + cp -a bindings/swig/python bindings/swig/python2 + cd bindings/swig/python2 + python2 setup.py build } -package() { - cd "$srcdir/$pkgname-$pkgver" +package_sword() { + depends=('curl' 'clucene' 'swig' 'xz') + backup=('etc/sword.conf') + cd "$srcdir/$pkgbase-$pkgver/build" make DESTDIR="$pkgdir" install - mkdir --parents "$pkgdir/etc" - make DESTDIR="$pkgdir" install_config +} + +package_python-sword() { + depends=('sword' 'python3') + + cd "$srcdir/$pkgbase-$pkgver/build/bindings/swig/python" + python3 setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build +} + +package_python2-sword() { + depends=('sword' 'python2') + + cd "$srcdir/$pkgbase-$pkgver/build/bindings/swig/python2" + python2 setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build } diff --git a/ttf-comme/PKGBUILD b/ttf-comme/PKGBUILD index eed155ec7..368038135 100644 --- a/ttf-comme/PKGBUILD +++ b/ttf-comme/PKGBUILD @@ -3,7 +3,7 @@ pkgname=ttf-comme _pkgname=commeFont pkgver=1.0 -pkgrel=2 +pkgrel=3 depends=('fontconfig' 'xorg-font-utils') makedepends=('git') pkgdesc="Comme is a fork from the Oxygen Font family, designed for Free desktops and UI's." @@ -11,7 +11,6 @@ arch=('x86_64') license=('OFL' 'GPL') url='https://github.com/vernnobile/commeFont' source=(git+https://github.com/vernnobile/commeFont.git) -install=$pkgname.install md5sums=('SKIP') package() diff --git a/ttf-comme/ttf-comme.install b/ttf-comme/ttf-comme.install deleted file mode 100644 index dd01ec2e3..000000000 --- a/ttf-comme/ttf-comme.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - echo -n "Updating font cache... " - fc-cache -f > /dev/null - echo "Done." -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/virtualbox/010-qt-5.11.patch b/virtualbox/010-qt-5.11.patch new file mode 100644 index 000000000..e1874536b --- /dev/null +++ b/virtualbox/010-qt-5.11.patch @@ -0,0 +1,11 @@ +diff -u -r VirtualBox-5.2.12/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp VirtualBox-5.2.12-qt/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp +--- VirtualBox-5.2.12/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp 2018-05-09 18:38:05.000000000 +0200 ++++ VirtualBox-5.2.12-qt/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp 2018-06-05 21:51:18.401913367 +0200 +@@ -21,6 +21,7 @@ + + /* Qt includes: */ + # include ++# include + + /* GUI includes: */ + # include "QIWidgetValidator.h" diff --git a/virtualbox/PKGBUILD b/virtualbox/PKGBUILD index ba891e8d1..538ef5835 100644 --- a/virtualbox/PKGBUILD +++ b/virtualbox/PKGBUILD @@ -11,7 +11,7 @@ pkgname=('virtualbox' 'virtualbox-ext-vnc' 'virtualbox-ext-oracle') pkgver=5.2.12 -pkgrel=2 +pkgrel=4 arch=('x86_64') url='https://www.virtualbox.org' license=('GPL') @@ -74,6 +74,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta '007-python2-path.patch' '008-no-vboxvideo.patch' '009-include-path.patch' + '010-qt-5.11.patch' 'PUEL') noextract=(VBoxGuestAdditions_$pkgver.iso "Oracle_VM_VirtualBox_Extension_Pack-$pkgver.vbox-extpack") @@ -97,6 +98,7 @@ sha256sums=('da60028c56708522fd89c000e8984d2105d275a3fd105a0bc698fc49d18d3458' '6bdb017459532537199c399eefd3d84d8dc7f1786e79997caebd3b6eb5c75d9f' '8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc' '1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4' + 'c6ef35e6893d557c7c2269ff79bc299fe9058cfb2c933a7efdc7a8a7b6d9c5da' '715c7246dc0f779ceab39446812362b2f9bf64a55ed5d3a905f053cfab36da9e') prepare() { @@ -335,7 +337,7 @@ package_virtualbox-guest-utils() { pkgdesc='VirtualBox Guest userspace utilities' depends=('glibc' 'pam' 'libx11' 'libxcomposite' 'libxdamage' 'libxext' 'libxfixes' 'libxmu' 'libxt' 'xorg-xrandr' - 'VIRTUALBOX-GUEST-MODULES' 'X-ABI-VIDEODRV_VERSION=23') + 'VIRTUALBOX-GUEST-MODULES' 'X-ABI-VIDEODRV_VERSION=24.0') replaces=('virtualbox-guest-additions') conflicts=('virtualbox-guest-additions' 'virtualbox-guest-utils-nox') install=virtualbox-guest-utils.install diff --git a/waf/PKGBUILD b/waf/PKGBUILD index fd06f8e12..faafee4db 100644 --- a/waf/PKGBUILD +++ b/waf/PKGBUILD @@ -1,16 +1,16 @@ pkgname=waf -pkgver=1.9.11 +pkgver=2.0.8 pkgrel=1 pkgdesc='General-purpose build system modelled after Scons' url='http://waf.io/' -arch=('any') +arch=('x86_64') license=('BSD') depends=('python3') makedepends=('unzip') provides=('python3-waf') options=('!emptydirs') source=("https://github.com/waf-project/waf/archive/waf-$pkgver.tar.gz") -sha256sums=('54791b3fe5a0a5e340946802736be892807894eb20f0680f56920c5935c634cf') +sha256sums=('0eeacb5a320caba819d6a5ea947a6ace527bbdd9789d888ea0f1313b9c2cad0b') prepare() { cd "$pkgname-$pkgname-$pkgver"