mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-23 18:14:51 +08:00
rebuild and updates for gcc group
This commit is contained in:
parent
d19906fb3a
commit
7ba97a8db5
@ -2,7 +2,7 @@ pkgname=clementine-qt5
|
||||
_pkgname=Clementine
|
||||
pkgver=1.3.1.r359.g987aa20b9
|
||||
_pkgver=987aa20
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Experimental Qt5 version of Clementine, a modern music player and library organiser."
|
||||
arch=('x86_64')
|
||||
license=('GPL')
|
||||
|
@ -1,7 +1,7 @@
|
||||
# Contributions from AUR: https://aur.archlinux.org/packages/grass70-svn/
|
||||
|
||||
pkgname=grass
|
||||
pkgver=7.2.0
|
||||
pkgver=7.2.2
|
||||
pkgrel=1
|
||||
_shortver=${pkgver%.*}; _shortver=${_shortver/./}
|
||||
pkgdesc="GRASS GIS: geospatial data management and analysis, image processing, graphics/maps production, spatial modeling and visualization."
|
||||
@ -21,7 +21,7 @@ optdepends=('r: R language interface; see http://grasswiki.osgeo.org/wiki/R_stat
|
||||
'lapack: required for GMATH library'
|
||||
'lesstif: motif support')
|
||||
source=("http://grass.osgeo.org/grass$_shortver/source/${pkgname}-${pkgver}.tar.gz")
|
||||
sha1sums=('ba6a89383daeec759da1aae5b04efeb314505107')
|
||||
sha1sums=('effdea8179708c7bea5ce46cc5de370f89db4576')
|
||||
|
||||
prepare() {
|
||||
cd $pkgname-$pkgver
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
pkgname=mixxx
|
||||
pkgver=2.0.0
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="Digital DJ mixing software with cpu optimization enabled"
|
||||
arch=('x86_64')
|
||||
url="http://www.mixxx.org/"
|
||||
@ -12,8 +12,24 @@ depends=('glu' 'fftw' 'libsndfile' 'libogg' 'taglib' 'libid3tag' 'libmad' 'libvo
|
||||
makedepends=('bzr' 'scons' 'pkgconfig')
|
||||
categories=('multimedia')
|
||||
screenshot=("http://www.mixxx.org/images/splash1.png")
|
||||
source=(http://downloads.mixxx.org/mixxx-${pkgver}/mixxx-${pkgver}-src.tar.gz)
|
||||
sha256sums=('e1b8f33bba35046608578095ed3209967034579252d84c99e6bc03ec030f676d')
|
||||
source=(http://downloads.mixxx.org/mixxx-${pkgver}/mixxx-${pkgver}-src.tar.gz
|
||||
mixxx-2.0.0-gcc-6.patch
|
||||
mixxx-2.0.0-chromaprint-1.4.0.patch
|
||||
mixxx-2.0.0-build.patch
|
||||
mixxx-remove-sqlite-typedef.patch)
|
||||
sha256sums=('e1b8f33bba35046608578095ed3209967034579252d84c99e6bc03ec030f676d'
|
||||
'6a8668eca89b0827de15e4b3e5d3e37eec1f7e2f540dd0106a6ed610eea7cf4f'
|
||||
'37f7a8897969b1d5421b02d6df5b69aff2a860eefaa0e24bef30b00d1a56021c'
|
||||
'964e3510b0c9fd35f9d501e188c001587f1e00f2ae35ecbe935f3f5016c6bd2e'
|
||||
'b95163b87f2e9441d9d580ff3acce978bc41034ff735e792948a2046979cd062')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
patch -p1 -i ../mixxx-2.0.0-gcc-6.patch
|
||||
patch -p1 -i ../mixxx-2.0.0-chromaprint-1.4.0.patch
|
||||
patch -p1 -i ../mixxx-2.0.0-build.patch
|
||||
patch -p1 -i ../mixxx-remove-sqlite-typedef.patch # rpmfusion
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
10
mixxx/mixxx-2.0.0-build.patch
Normal file
10
mixxx/mixxx-2.0.0-build.patch
Normal file
@ -0,0 +1,10 @@
|
||||
diff -ur mixxx-2.0.0/build/mixxx.py mixxx-2.0.0-patched/build/mixxx.py
|
||||
--- ./build/depends.py.orig 2016-02-09 04:30:54.860754912 +0000
|
||||
+++ ./build/depends.py 2016-02-09 04:29:53.286383033 +0000
|
||||
@@ -359,7 +359,6 @@ class Qt(Dependence):
|
||||
qtdir = build.env['QTDIR']
|
||||
framework_path = Qt.find_framework_libdir(qtdir, qt5)
|
||||
if os.path.isdir(framework_path):
|
||||
- build.env.Append(LINKFLAGS="-Wl,-rpath," + framework_path)
|
||||
build.env.Append(LINKFLAGS="-L" + framework_path)
|
||||
|
17
mixxx/mixxx-2.0.0-chromaprint-1.4.0.patch
Normal file
17
mixxx/mixxx-2.0.0-chromaprint-1.4.0.patch
Normal file
@ -0,0 +1,17 @@
|
||||
--- mixxx-2.0.0/src/musicbrainz/chromaprinter.cpp.old 2017-01-13 14:24:15.105139156 +0100
|
||||
+++ mixxx-2.0.0/src/musicbrainz/chromaprinter.cpp 2017-01-13 14:24:06.568450904 +0100
|
||||
@@ -57,12 +57,12 @@ QString ChromaPrinter::calcFingerPrint(c
|
||||
}
|
||||
chromaprint_finish(ctx);
|
||||
|
||||
- void* fprint = NULL;
|
||||
+ uint32_t* fprint = NULL;
|
||||
int size = 0;
|
||||
int ret = chromaprint_get_raw_fingerprint(ctx, &fprint, &size);
|
||||
QByteArray fingerprint;
|
||||
if (ret == 1) {
|
||||
- void* encoded = NULL;
|
||||
+ char* encoded = NULL;
|
||||
int encoded_size = 0;
|
||||
chromaprint_encode_fingerprint(fprint, size,
|
||||
CHROMAPRINT_ALGORITHM_DEFAULT,
|
17
mixxx/mixxx-2.0.0-gcc-6.patch
Normal file
17
mixxx/mixxx-2.0.0-gcc-6.patch
Normal file
@ -0,0 +1,17 @@
|
||||
--- ./src/util/math.h.orig 2016-07-14 04:13:22.861482580 +0100
|
||||
+++ ./src/util/math.h 2016-07-14 04:15:36.966067224 +0100
|
||||
@@ -4,7 +4,13 @@
|
||||
// Causes MSVC to define M_PI and friends.
|
||||
// http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx
|
||||
#define _USE_MATH_DEFINES
|
||||
-#include <cmath>
|
||||
+#include <math.h>
|
||||
+#include <cmath>
|
||||
+// Note: Because of our fpclassify hack, we actualy need to inlude both,
|
||||
+// the c and the c++ version of the math header.
|
||||
+// From GCC 6.1.1 math.h depends on cmath, which failes to compile if included
|
||||
+// after our fpclassify hack
|
||||
+
|
||||
#include <algorithm>
|
||||
|
||||
#include "util/assert.h"
|
27
mixxx/mixxx-remove-sqlite-typedef.patch
Normal file
27
mixxx/mixxx-remove-sqlite-typedef.patch
Normal file
@ -0,0 +1,27 @@
|
||||
--- a/src/library/trackcollection.cpp
|
||||
+++ b/src/library/trackcollection.cpp
|
||||
@@ -2,10 +2,6 @@
|
||||
#include <QtDebug>
|
||||
|
||||
#include "library/trackcollection.h"
|
||||
-
|
||||
-#ifdef __SQLITE3__
|
||||
-#include <sqlite3.h>
|
||||
-#endif
|
||||
|
||||
#include "library/librarytablemodel.h"
|
||||
#include "library/schemamanager.h"
|
||||
|
||||
--- a/src/library/trackcollection.h
|
||||
+++ b/src/library/trackcollection.h
|
||||
@@ -34,8 +34,7 @@
|
||||
#include "library/dao/libraryhashdao.h"
|
||||
|
||||
#ifdef __SQLITE3__
|
||||
-typedef struct sqlite3_context sqlite3_context;
|
||||
-typedef struct Mem sqlite3_value;
|
||||
+#include <sqlite3.h>
|
||||
#endif
|
||||
|
||||
class TrackInfoObject;
|
||||
|
@ -1,28 +1,37 @@
|
||||
pkgname=mumble
|
||||
pkgver=1.2.19
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=('x86_64')
|
||||
pkgdesc="A voice chat application similar to TeamSpeak."
|
||||
license=('BSD')
|
||||
depends=('qt' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf'
|
||||
'libpulse' 'xdg-utils' 'speech-dispatcher')
|
||||
'libpulse' 'xdg-utils' 'speech-dispatcher' 'speex' 'opus')
|
||||
makedepends=('boost' 'mesa')
|
||||
categories=('communication')
|
||||
install=${pkgname}.install
|
||||
url="http://www.mumble.com/"
|
||||
screenshot="http://mumble.sourceforge.net/static/Mumble%20--%201.2.3.png"
|
||||
source=("https://github.com/mumble-voip/mumble/releases/download/${pkgver}/mumble-${pkgver}.tar.gz")
|
||||
sha1sums=('8ea9dafad14e6c730da72ae9b4625778e499d94f')
|
||||
source=("https://github.com/mumble-voip/mumble/releases/download/${pkgver}/mumble-${pkgver}.tar.gz"
|
||||
AudioOutput.patch::https://github.com/mumble-voip/mumble/commit/e3871bb626f691e282085367d109b006f23e4389.patch)
|
||||
sha1sums=('8ea9dafad14e6c730da72ae9b4625778e499d94f'
|
||||
'cf82fe36f33eb8df89e0c518d62250cc0f7479d0')
|
||||
|
||||
prepare() {
|
||||
cd $srcdir/$pkgname-$pkgver
|
||||
|
||||
patch -Np1 -i $srcdir/AudioOutput.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $srcdir/$pkgname-$pkgver
|
||||
|
||||
# Building mumble
|
||||
qmake main.pro \
|
||||
CONFIG+="bundled-celt bundled-speex opus no-g15 no-xevie no-server \
|
||||
CONFIG+="bundled-celt no-bundled-opus no-bundled-speex no-g15 no-xevie no-server \
|
||||
no-embed-qt-translations no-update packaged" \
|
||||
DEFINES+="PLUGIN_PATH=/usr/lib/mumble" \
|
||||
INCLUDEPATH+="/usr/include/speech-dispatcher"
|
||||
INCLUDEPATH+="/usr/include/speech-dispatcher" \
|
||||
LIBS+="-lpng16 -lfreetype -lXrender -lfontconfig"
|
||||
make release
|
||||
}
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
pkgname=pokerth
|
||||
pkgver=1.1.2
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="PokerTH is a Texas Holdem poker game written in C++/Qt."
|
||||
arch=('x86_64')
|
||||
license=('AGPL3' 'custom:Variety of FOSS licenses for data files')
|
||||
|
@ -1,6 +1,6 @@
|
||||
pkgname=r
|
||||
pkgver=3.4.3
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Language and environment for statistical computing and graphics"
|
||||
arch=('x86_64')
|
||||
license=('GPL')
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
pkgname=sphinxbase
|
||||
pkgver=0.8
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
pkgdesc='Common library for sphinx speech recognition.'
|
||||
url='http://cmusphinx.sourceforge.net/'
|
||||
arch=('x86_64')
|
||||
|
@ -1,6 +1,6 @@
|
||||
pkgname=veusz
|
||||
pkgver=1.26.1
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="A scientific plotting package, designed to create publication-ready Postscript output"
|
||||
arch=('x86_64')
|
||||
url="http://gna.org/projects/veusz"
|
||||
|
Loading…
Reference in New Issue
Block a user