Commit 1250f03d authored by AlmAck's avatar AlmAck

rebuild against boost, and some pkgvar++

parent fd08bf55
pkgname=avogadro
pkgver=1.2.0
pkgrel=1
pkgrel=2
pkgdesc="An advanced molecular editor based on Qt"
arch=('x86_64')
url="http://avogadro.cc/wiki/Main_Page"
......@@ -9,18 +9,28 @@ depends=('eigen2' 'openbabel' 'python2-pyqt4' 'boost-libs' 'glew' 'python2-numpy
makedepends=('cmake' 'boost' 'doxygen' 'libgl')
categories=('education')
screenshot=('http://avogadro.openmolecules.net/w/images/7/75/Avogadro-unitcell.png')
source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
"boost153.patch"
"avogadro-fix-linking.patch")
sha256sums=('6453e36e8ae3e61655cbe062df6d6fa6b2409122c7b5abc0a6f1d410a181640b'
'0aaddbac2ed6e9688d7923a303b68c229f435068372f3665d731b1b9fa1d8cfb'
'3f7a236ec59684762514e81f8211cee625a44af843c8ce401e1ee002786e9d31')
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
'boost153.patch'
'avogadro-glibc2.23.patch'
'avogadro-fix-linking.patch'
'avogadro-force-eigen2.patch')
md5sums=('3206068fc27bd3b717c568ee72f1e5ec'
'aa2573f78d5dbd85b3cb79e08acde8ab'
'83990ecbb4c076fddda3eaca2c2975ed'
'e333f624d5649c6d3a7cfd14a778bc73'
'b05434bbf62570f72e0b0c7335cd44c3')
prepare() {
mkdir -p build
cd "${srcdir}/${pkgname}-${pkgver}"
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i "${srcdir}"/boost153.patch
# Fix build with glibc 2.23
patch -p1 -i "${srcdir}"/avogadro-glibc2.23.patch
# Fix linking (Fedora)
patch -p1 -i "${srcdir}"/avogadro-fix-linking.patch
# Force Eigen 2, newer versions of Eigen 3 remove backward
# compatibility
patch -p1 -i "${srcdir}"/avogadro-force-eigen2.patch
}
build() {
......
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1cbeb8f..e1e40d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -231,14 +231,7 @@ if(NOT Linguist_FOUND)
message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations")
endif()
-find_package(Eigen3) # find and setup Eigen3 if available
-if(NOT EIGEN3_FOUND)
- message(STATUS "Cannot find Eigen3, trying Eigen2")
- find_package(Eigen2 REQUIRED) # Some version is required
-else()
-# Use Stage10 Eigen3 support
- set (EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API TRUE)
-endif()
+find_package(Eigen2 REQUIRED)
find_package(ZLIB REQUIRED)
find_package(OpenBabel2 REQUIRED) # find and setup OpenBabel
--- avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/src/orbital.c.orig 2016-06-16 06:36:58.888214167 +0000
+++ avogadro-1.2.0/libavogadro/src/extensions/symmetry/libmsym/src/orbital.c 2016-06-16 06:37:19.091459100 +0000
@@ -67,13 +67,13 @@
}
case 2 : {
//o->v = dpolynomial[m+l];
- char *d = (signbit(m) == 1 ? "-" : "+");
+ char *d = (signbit(m*1.0) == 1 ? "-" : "+");
snprintf(o->name, sizeof(o->name), "%dd%d%s",n,abs(m),d);
break;
}
default : {
char t = 'f' - 3 + l;
- char *d = (signbit(m) == 1 ? "-" : "+");
+ char *d = (signbit(m*1.0) == 1 ? "-" : "+");
snprintf(o->name, sizeof(o->name), "%d%c%d%s",n,t,abs(m),d);
}
}
pkgname=calamares
pkgver=3.0.1.91
pkgrel=2
pkgrel=3
_releaseName="Goedel"
_releaseYear="2017"
pkgdesc='Distribution-independent installer framework'
......
# Arch contribution https://www.archlinux.org/packages/community/x86_64/cgal/
pkgname=cgal
pkgver=4.8.1
pkgver=4.10
pkgrel=1
_pkgid=35139
pkgdesc="Computational Geometry Algorithms Library"
arch=('x86_64')
url="http://www.cgal.org"
license=('GPL' 'LGPL')
source=(https://github.com/CGAL/cgal/archive/releases/CGAL-$pkgver.tar.gz)
depends=('mpfr' 'boost-libs' 'gmp' 'mesa' 'glu')
optdepends=('qt: for CGAL_Qt4'
'eigen3: for some packages, see the CGAL manual')
makedepends=('cmake' 'qt' 'eigen3' 'boost')
sha256sums=('206f0111dc3134992fa8b333dbf21bd1a386102f11325c30bdae17ac617914b3')
source=("https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-$pkgver/CGAL-$pkgver.tar.xz")
depends=('mpfr' 'gmp' 'mesa' 'glu' 'boost-libs')
optdepends=('qt5-svg: for CGAL_Qt5'
'eigen: for some packages, see the CGAL manual')
makedepends=('cmake' 'qt5-svg' 'eigen' 'boost')
md5sums=('0a60a756b6885580945122ee178dd8db')
# consider building with swig for python stuff
# https://gforge.inria.fr/frs/?group_id=52 for _pkgid
build() {
cd "$srcdir/cgal-releases-CGAL-$pkgver"
cd "$srcdir/CGAL-$pkgver"
mkdir build
cd build
cmake ../ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
cmake ../ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib
make
}
package() {
cd "$srcdir/cgal-releases-CGAL-$pkgver/build"
cd "$srcdir/CGAL-$pkgver/build"
make install DESTDIR="$pkgdir"
# The tarball still has all these licenses included
cd ..
install -D -m644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
for _license in LICENSE{,.FREE_USE,.GPL,.LGPL}; do
install -D -m644 "$srcdir/CGAL-$pkgver/$_license" "$pkgdir/usr/share/licenses/$pkgname/$_license"
done
}
--- kcalc-15.12.3/kcalc.cpp.orig 2016-03-16 16:26:37.327157522 +0000
+++ kcalc-15.12.3/kcalc.cpp 2016-03-16 16:28:08.533357025 +0000
@@ -123,7 +123,7 @@
updateGeometry();
- setFixedSize(minimumSize());
+ if ( ! minimumSize().isEmpty() ) setFixedSize(minimumSize());
updateDisplay(UPDATE_FROM_CORE);
pkgname=kcm-systemd
_pkgname=systemd-kcm
pkgver=1.2.1
pkgrel=2
pkgrel=3
pkgdesc="Systemd control module for KDE"
arch=('x86_64')
url='https://github.com/rthomsen/kcmsystemd'
......
pkgname=kmymoney
pkgver=4.8.0
pkgrel=4
pkgrel=5
pkgdesc="A finance manager for KDE4 with HBCI support"
arch=('x86_64')
url="http://kmymoney2.sourceforge.net"
......
pkgname=knightsgame
_pkgname=knights
pkgver=025
pkgrel=2
pkgrel=3
pkgdesc='Action game that was originally released for Amiga in 1994.'
arch=('x86_64')
url='http://www.knightsgame.org.uk/'
......
......@@ -4,7 +4,7 @@ source ../kdeapps.conf
pkgname=kstars
pkgver=${_kdever}
pkgrel=1
pkgrel=2
pkgdesc="Desktop planetarium"
url="http://kde.org/applications/education/kstars/"
arch=('x86_64')
......
pkgname=libindi
pkgver=1.2.0
pkgrel=2
pkgver=1.4.1
pkgrel=1
pkgdesc="A distributed control protocol designed to operate astronomical instrumentation"
url="http://www.indilib.org/index.php?title=Main_Page"
license=('GPL2')
arch=('x86_64')
depends=('libnova' 'cfitsio' 'boost-libs' 'libusb' 'libjpeg' 'gsl')
makedepends=('cmake' 'boost')
replaces=(indilib)
options=('staticlibs') # libindiclient builds as static only
source=("http://www.indilib.org/jdownloads/Source/${pkgname}_${pkgver}.tar.gz")
sha256sums=('a1cf17a4f0a0ca30afd4c131b82e181aeb42a68cda176d5b4c6945436ced2321')
depends=(libnova cfitsio libusb libjpeg gsl curl)
makedepends=(cmake boost qt5-base)
source=("https://github.com/indilib/indi/releases/download/v$pkgver/libindi_$pkgver.tar.gz")
sha256sums=('f393faa01d98ead9a4205b567402d37fc48a1e53896ed0caeb0e0567bd3ba2e6')
prepare() {
mkdir -p build
sed -e 's|GROUP="plugdev", MODE="0666"|TAG+="uaccess"|' -i libindi/drivers/*/*.rules
}
build() {
cd build
cmake ../${pkgname}_${pkgver} \
cmake ../libindi \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DUDEVRULES_INSTALL_DIR=/usr/lib/udev/rules.d
make
}
......
pkgname=librevenge
pkgver=0.0.4
pkgrel=1
pkgrel=2
pkgdesc="library for REVerses ENGineered formats filters"
arch=('x86_64')
url="http://sf.net/p/libwpd/librevenge/"
......
pkgname=lipsofsuna
pkgver=0.8.0
pkgrel=6
pkgrel=7
pkgdesc="Tongue-in-cheek dungeon crawl game that takes place in the chaotic dungeons of Suna."
arch=('i686' 'x86_64')
arch=('x86_64')
url="http://lipsofsuna.org/"
license=('LGPL3' 'CCPL:by-sa' 'CCPL:by' 'custom:CC0')
depends=('bullet' 'boost-libs' 'enet' 'flac' 'glew' 'inotify-tools' 'libogg' 'libvorbis' 'lua' 'ogre' 'openal' 'sdl' 'sdl_ttf' 'sqlite3')
......
pkgname=mp3diags
pkgver=1.2.03
pkgrel=1
pkgrel=2
pkgdesc="GUI-based application that allows end-users to identify issues with their MP3 files, fix some of the issues and make other changes."
url="http://sourceforge.net/projects/mp3diags/"
license=('GPL')
......
pkgname=mupen64plus
pkgver=2.5
pkgrel=3
pkgrel=4
pkgdesc='Nintendo64™ Emulator.'
arch=('x86_64')
url='http://www.mupen64plus.org/'
......
pkgname=performous
pkgver=1.1
pkgrel=3
pkgrel=4
pkgdesc='A free game like Singstar™, Rockband™ or Stepmania™'
arch=('x86_64')
url="http://$pkgname.org/"
......
......@@ -3,7 +3,7 @@
pkgname=pokerth
_realname=PokerTH
pkgver=1.1.1
pkgrel=9
pkgrel=10
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')
......@@ -13,10 +13,14 @@ url="http://www.pokerth.net/"
source=("http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2"
'0001-Qt-5.5.0-patch-for-qtsingleapplication.patch'
'pokerth-1.1.1-Qualify-std-ifstream-and-std-ofstream.patch')
'pokerth-1.1.1-Qualify-std-ifstream-and-std-ofstream.patch'
'pokerth-gcc6.patch'
'pokerth-c++11.patch')
md5sums=('a7f76f95782099f966e5f2b6809f502a'
'f4ecab0a6435f1b3b0654145b75d6e7c'
'26b02c7e5c50484485570ace9b63be5b')
'26b02c7e5c50484485570ace9b63be5b'
'39070e7d656ae654e54ec9e25f9eea83'
'ee027e6bd85d245f6f3ae74c68ed91cb')
prepare() {
cd "$srcdir/$_realname-$pkgver-src"
......@@ -26,6 +30,10 @@ prepare() {
# https://github.com/pokerth/pokerth/commit/69f820bb3
patch -p1 -i ../pokerth-1.1.1-Qualify-std-ifstream-and-std-ofstream.patch
# Fix build with GCC 6
patch -p1 -i ../pokerth-gcc6.patch
patch -p1 -i ../pokerth-c++11.patch
}
build() {
......
From 924fcd64044bd17c683345627def83df044ce867 Mon Sep 17 00:00:00 2001
From: Felix Hammer <f.hammer@web.de>
Date: Wed, 19 Aug 2015 15:02:10 +0200
Subject: [PATCH] Linux Desktop build fix
---
pokerth_lib.pro | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pokerth_lib.pro b/pokerth_lib.pro
index 6ab18b9..e9f1e3a 100644
--- a/pokerth_lib.pro
+++ b/pokerth_lib.pro
@@ -256,6 +256,8 @@ win32{
##### My release static build options
#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
INCLUDEPATH += /opt/gsasl/include
+ DEFINES += _WEBSOCKETPP_CPP11_STL_
+ QMAKE_CXXFLAGS += -std=gnu++11
}
mac{
#diff --git a/pokerth_qml-client.pro b/pokerth_qml-client.pro
#index 6e5223f..eec1feb 100644
#--- a/pokerth_qml-client.pro
#+++ b/pokerth_qml-client.pro
#@@ -6,7 +6,6 @@ isEmpty( PREFIX ){
# DEFINES += PREFIX=\"$${PREFIX}\"
#
# TEMPLATE = app
#-TARGET = pokerth
# CODECFORSRC = UTF-8
# QT += core qml quick widgets svg sql
# CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on
diff --git a/src/net/common/sessiondata.cpp b/src/net/common/sessiondata.cpp
index 06f7146..69bcdb7 100644
--- a/src/net/common/sessiondata.cpp
+++ b/src/net/common/sessiondata.cpp
@@ -318,8 +318,9 @@ void
SessionData::CloseWebSocketHandle()
{
if (m_webData) {
- boost::system::error_code ec;
- m_webData->webSocketServer->close(m_webData->webHandle, websocketpp::close::status::normal, "PokerTH server closed the connection.", ec);
+// boost::system::error_code ec;
+ std::error_code std_ec;
+ m_webData->webSocketServer->close(m_webData->webHandle, websocketpp::close::status::normal, "PokerTH server closed the connection.", std_ec);
}
}
diff --git a/src/net/common/websendbuffer.cpp b/src/net/common/websendbuffer.cpp
index 2ba665a..3130373 100644
--- a/src/net/common/websendbuffer.cpp
+++ b/src/net/common/websendbuffer.cpp
@@ -57,9 +57,10 @@ void
WebSendBuffer::AsyncSendNextPacket(boost::shared_ptr<SessionData> session)
{
if (closeAfterSend) {
- boost::system::error_code ec;
+// boost::system::error_code ec;
+ std::error_code std_ec;
boost::shared_ptr<WebSocketData> webData = session->GetWebData();
- webData->webSocketServer->close(webData->webHandle, websocketpp::close::status::normal, "PokerTH server closed the connection.", ec);
+ webData->webSocketServer->close(webData->webHandle, websocketpp::close::status::normal, "PokerTH server closed the connection.", std_ec);
}
}
@@ -70,10 +71,11 @@ WebSendBuffer::InternalStorePacket(boost::shared_ptr<SessionData> session, boost
google::protobuf::uint8 *buf = new google::protobuf::uint8[packetSize];
packet->GetMsg()->SerializeWithCachedSizesToArray(buf);
- boost::system::error_code ec;
+// boost::system::error_code ec;
+ std::error_code std_ec;
boost::shared_ptr<WebSocketData> webData = session->GetWebData();
- webData->webSocketServer->send(webData->webHandle, string((const char *)buf, packetSize), websocketpp::frame::opcode::BINARY, ec);
- if (ec) {
+ webData->webSocketServer->send(webData->webHandle, string((const char *)buf, packetSize), websocketpp::frame::opcode::BINARY, std_ec);
+ if (std_ec) {
SetCloseAfterSend();
}
diff --git a/src/net/serveracceptwebhelper.h b/src/net/serveracceptwebhelper.h
index a1d371e..f7e8123 100644
--- a/src/net/serveracceptwebhelper.h
+++ b/src/net/serveracceptwebhelper.h
@@ -52,7 +53,7 @@ class ServerAcceptWebHelper : public ServerAcceptInterface
protected:
- typedef std::map<websocketpp::connection_hdl, boost::weak_ptr<SessionData> > SessionMap;
+ typedef std::map<websocketpp::connection_hdl, boost::weak_ptr<SessionData>, std::owner_less<websocketpp::connection_hdl> > SessionMap;
bool validate(websocketpp::connection_hdl hdl);
void on_open(websocketpp::connection_hdl hdl);
--- PokerTH-1.1.1-src/pokerth_db.pro.orig 2016-05-12 20:20:57.336018308 +0000
+++ PokerTH-1.1.1-src/pokerth_db.pro 2016-05-12 20:21:14.335959204 +0000
@@ -49,7 +49,6 @@
!win32{
##### My release static build options
#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
- INCLUDEPATH += $${PREFIX}/include
}
mac{
--- PokerTH-1.1.1-src/pokerth_lib.pro.orig 2016-05-12 20:24:53.581864921 +0000
+++ PokerTH-1.1.1-src/pokerth_lib.pro 2016-05-12 20:25:20.441771862 +0000
@@ -243,7 +243,7 @@
!win32{
##### My release static build options
#QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
- INCLUDEPATH += $${PREFIX}/include /opt/gsasl/include
+ INCLUDEPATH += /opt/gsasl/include
}
mac{
--- PokerTH-1.1.1-src/pokerth_game.pro.orig 2016-05-12 21:02:08.527791266 +0000
+++ PokerTH-1.1.1-src/pokerth_game.pro 2016-05-12 21:02:19.027758386 +0000
@@ -402,7 +402,6 @@
# #### My release static build options
# QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
# QMAKE_LFLAGS += -Wl,--gc-sections
- INCLUDEPATH += $${PREFIX}/include
QMAKE_LIBDIR += lib
!android{
LIBPATH += $${PREFIX}/lib /opt/gsasl/lib
--- PokerTH-1.1.1-src/pokerth_server.pro.orig 2016-05-12 21:10:02.469679181 +0000
+++ PokerTH-1.1.1-src/pokerth_server.pro 2016-05-12 21:10:34.106251260 +0000
@@ -174,7 +174,6 @@
#QMAKE_LFLAGS += -Wl,--gc-sections
LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib
- INCLUDEPATH += $${PREFIX}/include
LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
BOOST_FS = boost_filesystem boost_filesystem-mt
BOOST_THREAD = boost_thread boost_thread-mt
......@@ -3,7 +3,7 @@
pkgname=rstudio
_pkgname=rstudio-rstudio
pkgver=1.0.136
pkgrel=1
pkgrel=2
pkgdesc="A new integrated development environment (IDE) for R - The Desktop Client"
arch=('x86_64')
url="http://www.rstudio.org/"
......
pkgname=scribus
pkgver=1.4.6
pkgrel=4
pkgrel=5
pkgdesc="A desktop publishing program"
arch=('x86_64')
url="http://www.scribus.net"
......
pkgname=snapper
pkgver=0.5.0
pkgrel=1
pkgrel=2
pkgdesc="A tool for managing BTRFS and LVM snapshots. It can create, diff and restore snapshots and provides timelined auto-snapping."
arch=('x86_64')
url="http://snapper.io"
......
pkgname=spring
_pkgname=springrts
pkgver=101.0
pkgrel=2
pkgrel=3
pkgdesc='A 3D real-time-strategy game engine.'
arch=('x86_64')
url="http://springrts.com/"
......
pkgname=wesnoth
pkgver=1.12.6
pkgrel=2
pkgrel=3
pkgdesc="A turn-based strategy game on a fantasy world."
arch=('x86_64')
license=('GPL2')
......
pkgname=widelands
pkgver=19
_realver=build${pkgver}
pkgrel=2
pkgrel=3
pkgdesc="A realtime strategy game with emphasis on economy and transport."
arch=('x86_64')
url="http://widelands.org/"
......
pkgname=xsd
pkgver=4.0.0
_pkgver=4.0.0+dep
pkgrel=1
pkgrel=2
pkgdesc="An open-source, cross-platform W3C XML Schema to C++ data binding compiler"
arch=('x86_64')
url="http://www.codesynthesis.com/products/xsd"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment