pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
swift: Add partial update of chat/swift to 4.0beta2
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Mon Aug 1 11:10:59 2016 +0200
Changeset: bd9cf0a4b7700e3b938bdc1b10aae1ad6c541b91
Modified Files:
Makefile
Added Files:
swift/DESCR
swift/Makefile
swift/PLIST
swift/distinfo
swift/log
swift/patches/patch-BuildTools_SCons_SConscript.boot
swift/patches/patch-BuildTools_SCons_SConstruct
Log Message:
swift: Add partial update of chat/swift to 4.0beta2
Still doesn't build for the same reason chat/swift doesn't.
(int128 issues with boost-1.61 on NetBSD/7.99.34)
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bd9cf0a4b7700e3b938bdc1b10aae1ad6c541b91
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 45 ++++++++++++++++-
swift/DESCR | 18 +++++++
swift/Makefile | 58 ++++++++++++++++++++++
swift/PLIST | 28 +++++++++++
swift/distinfo | 8 +++
swift/log | 15 ++++++
.../patches/patch-BuildTools_SCons_SConscript.boot | 19 +++++++
swift/patches/patch-BuildTools_SCons_SConstruct | 15 ++++++
8 files changed, 204 insertions(+), 2 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 24243a2..5f63621 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,8 @@
COMMENT= WIP pkgsrc packages
#SUBDIR+= .git # to silence pkglint
+SUBDIR+= 0ad
+SUBDIR+= 0ad-data
SUBDIR+= 389-ds-base
SUBDIR+= Bear
SUBDIR+= Chinput
@@ -83,7 +85,6 @@ SUBDIR+= afflib
SUBDIR+= afl-cov
SUBDIR+= agfl
SUBDIR+= agile
-SUBDIR+= agm
SUBDIR+= ags
SUBDIR+= aida
SUBDIR+= aircrack-ng
@@ -1655,6 +1656,7 @@ SUBDIR+= libscscp
SUBDIR+= libslab
SUBDIR+= libsocialweb
SUBDIR+= libspt
+SUBDIR+= libsquish
SUBDIR+= libstacktrace
SUBDIR+= libstrophe
SUBDIR+= libsysstat
@@ -2034,6 +2036,7 @@ SUBDIR+= nuppelvideo
SUBDIR+= nuttcp
SUBDIR+= nuvie
SUBDIR+= nvidia-freebsd
+SUBDIR+= nvidia-texture-tools
SUBDIR+= nx-client-bin
SUBDIR+= nzbget
SUBDIR+= obconf-qt
@@ -2523,6 +2526,7 @@ SUBDIR+= plasma-workspace
SUBDIR+= plasma-workspace-wallpapers
SUBDIR+= plasti
SUBDIR+= plconfig
+SUBDIR+= plist-utils
SUBDIR+= plod
SUBDIR+= plplot
SUBDIR+= plugger
@@ -2624,6 +2628,7 @@ SUBDIR+= py-agaro
SUBDIR+= py-agio
SUBDIR+= py-ahoy
SUBDIR+= py-aikif
+SUBDIR+= py-aiohttp
SUBDIR+= py-aipy
SUBDIR+= py-albatross
SUBDIR+= py-alembic
@@ -2698,6 +2703,7 @@ SUBDIR+= py-calverter
SUBDIR+= py-cameo
SUBDIR+= py-captcha
SUBDIR+= py-cartopy
+SUBDIR+= py-causalinfo
SUBDIR+= py-cbc
SUBDIR+= py-ccdproc
SUBDIR+= py-cclib
@@ -2749,6 +2755,7 @@ SUBDIR+= py-complexsystems
SUBDIR+= py-concepts
SUBDIR+= py-conda
SUBDIR+= py-conda-env
+SUBDIR+= py-confire
SUBDIR+= py-consensus
SUBDIR+= py-constraint
SUBDIR+= py-control
@@ -2779,6 +2786,7 @@ SUBDIR+= py-da
SUBDIR+= py-dana
SUBDIR+= py-das
SUBDIR+= py-dask
+SUBDIR+= py-datamarix
SUBDIR+= py-datarray
SUBDIR+= py-datatree
SUBDIR+= py-dbglog
@@ -2845,7 +2853,9 @@ SUBDIR+= py-embedc
SUBDIR+= py-emcee
SUBDIR+= py-emmsa
SUBDIR+= py-empirical
+SUBDIR+= py-engfmt
SUBDIR+= py-enre
+SUBDIR+= py-enum
SUBDIR+= py-enumit
SUBDIR+= py-epigrass
SUBDIR+= py-epipy
@@ -2871,10 +2881,13 @@ SUBDIR+= py-feyn
SUBDIR+= py-ffc
SUBDIR+= py-fiat
SUBDIR+= py-figleaf
+SUBDIR+= py-fileinspector
+SUBDIR+= py-filelock
SUBDIR+= py-fiona
SUBDIR+= py-fipy
SUBDIR+= py-fitsarray
SUBDIR+= py-fjd
+SUBDIR+= py-flake8-polyfill
SUBDIR+= py-flipper
SUBDIR+= py-fluiddyn
SUBDIR+= py-fmmlib
@@ -2895,8 +2908,10 @@ SUBDIR+= py-gammafit
SUBDIR+= py-gaphas
SUBDIR+= py-gato
SUBDIR+= py-gauss
+SUBDIR+= py-gbpy
SUBDIR+= py-gcalendarsync
SUBDIR+= py-gccxml
+SUBDIR+= py-gem
SUBDIR+= py-genesis
SUBDIR+= py-geographiclib
SUBDIR+= py-geoip
@@ -2916,6 +2931,7 @@ SUBDIR+= py-gogo
SUBDIR+= py-golangenv
SUBDIR+= py-goless
SUBDIR+= py-goreutilities
+SUBDIR+= py-gorm
SUBDIR+= py-gosam
SUBDIR+= py-goulib
SUBDIR+= py-gpaw
@@ -2936,15 +2952,19 @@ SUBDIR+= py-gts
SUBDIR+= py-guppy
SUBDIR+= py-gvar
SUBDIR+= py-gwpy
+SUBDIR+= py-gwsurrogate
SUBDIR+= py-hamilton
+SUBDIR+= py-hamnonlineng
SUBDIR+= py-hamopy
SUBDIR+= py-handy
+SUBDIR+= py-harvestingkit
SUBDIR+= py-hcluster
SUBDIR+= py-hddm
SUBDIR+= py-hdf5able
SUBDIR+= py-hdf5storage
SUBDIR+= py-healpy
SUBDIR+= py-helio
+SUBDIR+= py-hepcrawl
SUBDIR+= py-hessianfree
SUBDIR+= py-hfk
SUBDIR+= py-hgapi
@@ -2953,8 +2973,11 @@ SUBDIR+= py-hmf
SUBDIR+= py-holoviews
SUBDIR+= py-hope
SUBDIR+= py-hostlist
+SUBDIR+= py-htmlparser
SUBDIR+= py-htseq
+SUBDIR+= py-httpretty
SUBDIR+= py-hurry-filesize
+SUBDIR+= py-hybridlfpy
SUBDIR+= py-hyperspy
SUBDIR+= py-ibis
SUBDIR+= py-icane
@@ -2984,6 +3007,7 @@ SUBDIR+= py-jbessel
SUBDIR+= py-jedi
SUBDIR+= py-jelly
SUBDIR+= py-jewish
+SUBDIR+= py-jitcode
SUBDIR+= py-joblib
SUBDIR+= py-jokosher
SUBDIR+= py-jsonpath
@@ -2999,12 +3023,14 @@ SUBDIR+= py-kaa-metadata
SUBDIR+= py-kabuki
SUBDIR+= py-karta
SUBDIR+= py-kcs11
+SUBDIR+= py-keras
SUBDIR+= py-keyczar
SUBDIR+= py-khayyam
SUBDIR+= py-kineticlib
SUBDIR+= py-kitchen
SUBDIR+= py-kivy
SUBDIR+= py-kiwisolver
+SUBDIR+= py-knnimpute
SUBDIR+= py-knockknock
SUBDIR+= py-krylov
SUBDIR+= py-krypy
@@ -3034,6 +3060,7 @@ SUBDIR+= py-linop
SUBDIR+= py-lire
SUBDIR+= py-liveplots
SUBDIR+= py-llfuse
+SUBDIR+= py-lmfit
SUBDIR+= py-locustio
SUBDIR+= py-logbook
SUBDIR+= py-loggly
@@ -3089,6 +3116,7 @@ SUBDIR+= py-moksha-common
SUBDIR+= py-moksha-hub
SUBDIR+= py-monad
SUBDIR+= py-monty
+SUBDIR+= py-mote
SUBDIR+= py-mox
SUBDIR+= py-moya
SUBDIR+= py-mpi4py
@@ -3099,6 +3127,7 @@ SUBDIR+= py-mssql2
SUBDIR+= py-msumastro
SUBDIR+= py-multichain_mcmc
SUBDIR+= py-multimethods
+SUBDIR+= py-multiprocess
SUBDIR+= py-mvpoly
SUBDIR+= py-myfitter
SUBDIR+= py-mysqldb-docs
@@ -3129,6 +3158,7 @@ SUBDIR+= py-nipy-data
SUBDIR+= py-nlib
SUBDIR+= py-nltk
SUBDIR+= py-nodepy
+SUBDIR+= py-nose-parameterized
SUBDIR+= py-nose-senario
SUBDIR+= py-nosh
SUBDIR+= py-notify-dev
@@ -3146,7 +3176,6 @@ SUBDIR+= py-oak
SUBDIR+= py-oasa
SUBDIR+= py-ocrodjvu
SUBDIR+= py-oct2py
-SUBDIR+= py-ode
SUBDIR+= py-odeint
SUBDIR+= py-odesys
SUBDIR+= py-odeviz
@@ -3189,11 +3218,14 @@ SUBDIR+= py-peak-rules
SUBDIR+= py-pebl
SUBDIR+= py-peng
SUBDIR+= py-percol
+SUBDIR+= py-periodictable
SUBDIR+= py-peru
SUBDIR+= py-pet
+SUBDIR+= py-pickleshare
SUBDIR+= py-pint
SUBDIR+= py-piquant
SUBDIR+= py-pithos
+SUBDIR+= py-plac
SUBDIR+= py-plete
SUBDIR+= py-plex
SUBDIR+= py-plink
@@ -3201,12 +3233,14 @@ SUBDIR+= py-plucker
SUBDIR+= py-plumbum
SUBDIR+= py-ply
SUBDIR+= py-pmi
+SUBDIR+= py-poppy
SUBDIR+= py-poster
SUBDIR+= py-postmarkup
SUBDIR+= py-pot
SUBDIR+= py-poyo
SUBDIR+= py-pp
SUBDIR+= py-prayertime
+SUBDIR+= py-prel
SUBDIR+= py-premailer
SUBDIR+= py-prioritized-methods
SUBDIR+= py-processing
@@ -3219,6 +3253,7 @@ SUBDIR+= py-prompt-toolkit
SUBDIR+= py-prop
SUBDIR+= py-psamm
SUBDIR+= py-pseudopy
+SUBDIR+= py-pseudorandom
SUBDIR+= py-psychopy
SUBDIR+= py-ptrace
SUBDIR+= py-pulp
@@ -3283,6 +3318,7 @@ SUBDIR+= py-qit
SUBDIR+= py-qitensor
SUBDIR+= py-qmath
SUBDIR+= py-qnet
+SUBDIR+= py-qtpy
SUBDIR+= py-quantities
SUBDIR+= py-quaternionarray
SUBDIR+= py-quaternions
@@ -3459,6 +3495,7 @@ SUBDIR+= py-traitsgui
SUBDIR+= py-tranquil
SUBDIR+= py-transaction
SUBDIR+= py-translationstring
+SUBDIR+= py-tribe
SUBDIR+= py-trimesh
SUBDIR+= py-trollius
SUBDIR+= py-trottersuzuki
@@ -3855,6 +3892,7 @@ SUBDIR+= speedx
SUBDIR+= spfmilter
SUBDIR+= spidermonkey185
SUBDIR+= spidermonkey24
+SUBDIR+= spidermonkey31
SUBDIR+= splix
SUBDIR+= spread4
SUBDIR+= spyder
@@ -3906,6 +3944,7 @@ SUBDIR+= swami
SUBDIR+= swarp
SUBDIR+= swfmill
SUBDIR+= swftools
+SUBDIR+= swift
SUBDIR+= swift-git
SUBDIR+= swisseph
SUBDIR+= sxemacs
@@ -4034,6 +4073,8 @@ SUBDIR+= tome2
SUBDIR+= tophat
SUBDIR+= tops-bin
SUBDIR+= torcs
+SUBDIR+= torque2d
+SUBDIR+= torque3d
SUBDIR+= torsocks
SUBDIR+= tortunnel
SUBDIR+= totem
diff --git a/swift/DESCR b/swift/DESCR
new file mode 100644
index 0000000..c0d839b
--- /dev/null
+++ b/swift/DESCR
@@ -0,0 +1,18 @@
+Swift is trying to plug a hole in the XMPP client landscape, and has
+these aims:
+
+ * Wide platform availability.
+ * Doing the "Right Thing" for the user, without configuration.
+ * Doing the "Right Thing" with standards-compliance.
+ * Targeting the end-users, not the system administrators.
+ * Being an XMPP client - not multi-protocol.
+ * Concentrating on the most frequently performed tasks.
+ * Never interrupt the user with something that doesn't need attention.
+
+Features of interest
+
+ * Easy status setting.
+ * Easy room joining and bookmarking.
+ * XEP-0258 Labelling for secure environments.
+ * Stream compression for bandwidth-saving.
+ * Support for the new SCRAM authentication mechanism.
diff --git a/swift/Makefile b/swift/Makefile
new file mode 100644
index 0000000..ac32456
--- /dev/null
+++ b/swift/Makefile
@@ -0,0 +1,58 @@
+# $NetBSD: Makefile,v 1.12 2016/06/06 11:17:11 wiz Exp $
+
+DISTNAME= swift-4.0beta2
+CATEGORIES= chat
+MASTER_SITES= http://swift.im/downloads/releases/${DISTNAME}/
+
+MAINTAINER= eric%cirr.com@localhost
+HOMEPAGE= http://swift.im/
+COMMENT= Swift XMPP Client
+LICENSE= gnu-gpl-v3
+
+DEPENDS+= scons>=1.3:../../devel/scons
+
+USE_LANGUAGES= c c++
+USE_TOOLS+= pkg-config
+
+CXXFLAGS+= -std=c++11
+
+INSTALLATION_DIRS= ${PKGMANDIR}/man1
+
+SUBST_CLASSES+= path
+SUBST_STAGE.path= pre-configure
+SUBST_SED.path+= -e "s,/usr/local/share/,${PREFIX}/share/,"
+SUBST_FILES.path+= SwifTools/Application/UnixApplicationPathProvider.cpp
+SUBST_MESSAGE.path= Fixing path to support files.
+
+MAKE_ENV+= qt5=1
+
+do-configure:
+ cd ${WRKSRC} ; \
+ ${ECHO} "qt=\"${QTDIR}\"" > config.py ;\
+ ${ECHO} "qt5=1" >> config.py ;\
+ ${ECHO} "linkflags=\"-L${PREFIX}/lib -Wl,-R${QTDIR}/lib -Wl,-R${X11BASE}/lib -Wl,-R${BUILDLINK_DIR}/lib\"" >> config.py ; \
+ ${ECHO} "ccflags=\"${CXXFLAGS}\"" >> config.py ; \
+ ${ECHO} "allow_warnings=\"true\"" >> config.py ;
+
+do-build:
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons Swift
+
+do-install:
+ cd ${WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons \
+ SWIFT_INSTALLDIR=${DESTDIR}/${PREFIX} ${DESTDIR}/${PREFIX}
+ ${INSTALL_DATA} ${WRKSRC}/Swift/Packaging/Debian/debian/swift-im.1 \
+ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
+.include "../../lang/python/application.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
+.include "../../x11/qt5-qtwebkit/buildlink3.mk"
+.include "../../x11/qt5-qtx11extras/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/swift/PLIST b/swift/PLIST
new file mode 100644
index 0000000..e6b479e
--- /dev/null
+++ b/swift/PLIST
@@ -0,0 +1,28 @@
+@comment $NetBSD: PLIST,v 1.3 2016/03/01 13:25:01 wiz Exp $
+bin/swift-im
+bin/swift-open-uri
+man/man1/swift-im.1
+share/applications/swift.desktop
+share/icons/hicolor/128x128/apps/swift.png
+share/icons/hicolor/16x16/apps/swift.png
+share/icons/hicolor/22x22/apps/swift.png
+share/icons/hicolor/24x24/apps/swift.png
+share/icons/hicolor/32x32/apps/swift.xpm
+share/icons/hicolor/64x64/apps/swift.png
+share/icons/hicolor/scalable/apps/swift.svg
+share/pixmaps/swift.xpm
+share/swift/sounds/message-received.wav
+share/swift/translations/swift_ca.qm
+share/swift/translations/swift_cs.qm
+share/swift/translations/swift_de.qm
+share/swift/translations/swift_en.qm
+share/swift/translations/swift_es.qm
+share/swift/translations/swift_fr.qm
+share/swift/translations/swift_gl.qm
+share/swift/translations/swift_he.qm
+share/swift/translations/swift_hu.qm
+share/swift/translations/swift_nl.qm
+share/swift/translations/swift_pl.qm
+share/swift/translations/swift_ru.qm
+share/swift/translations/swift_sk.qm
+share/swift/translations/swift_sv.qm
diff --git a/swift/distinfo b/swift/distinfo
new file mode 100644
index 0000000..acaba91
--- /dev/null
+++ b/swift/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.5 2016/03/01 13:25:01 wiz Exp $
+
+SHA1 (swift-4.0beta2.tar.gz) = 54aa1505604094e99312c6cfd7d451e5ab01dfd9
+RMD160 (swift-4.0beta2.tar.gz) = 1adc3f6b38fa8e6e831629ba2c7c921f64af283d
+SHA512 (swift-4.0beta2.tar.gz) = b841ecca4177b65c872aa4a93ade97888db3a4f3424ee18dffa1c44587d52b05283e72b3b392a426a1c8988b4da0f9660678bc587f7e16830434947aec5c7d60
+Size (swift-4.0beta2.tar.gz) = 17250151 bytes
+SHA1 (patch-BuildTools_SCons_SConscript.boot) = c773dcace8d21f8f67d19adbd29256936f327c44
+SHA1 (patch-BuildTools_SCons_SConstruct) = 620084993487b49ca617be7439c2c4fd885962f1
diff --git a/swift/log b/swift/log
new file mode 100644
index 0000000..ade5749
--- /dev/null
+++ b/swift/log
@@ -0,0 +1,15 @@
+Swift 4.0 is currently on Beta release, please uninstall older Swift
+packages before upgrading to this release on Windows. The main
+changes since 3.0 are:
+
+* Support for message carbons (XEP-0280)
+* Improved spell checker support on Linux
+* Enabled trellis mode as a default feature, allowing several
+ tiled chats windows to be shown at once
+* New chat theme including a new font
+* Assorted smaller features and usability enhancements
+* Fix Swift bug introduced in 4.0-beta1 that results in the UI
+ sometimes getting stuck during login
+
+Thanks to all our contributors of code, translations, testing, ideas
+and other support.
diff --git a/swift/patches/patch-BuildTools_SCons_SConscript.boot b/swift/patches/patch-BuildTools_SCons_SConscript.boot
new file mode 100644
index 0000000..925710e
--- /dev/null
+++ b/swift/patches/patch-BuildTools_SCons_SConscript.boot
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Don't strip environment so pkgsrc settings survive.
+
+--- BuildTools/SCons/SConscript.boot.orig 2016-07-20 22:17:03.000000000 +0000
++++ BuildTools/SCons/SConscript.boot
+@@ -110,11 +110,7 @@ vars.Add("codesign_identity", "macOS cod
+ # Set up default build & configure environment
+ ################################################################################
+
+-env_ENV = {
+- 'PATH' : os.environ['PATH'],
+- 'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""),
+- 'TERM' : os.environ.get("TERM", ""),
+-}
++env_ENV = os.environ
+
+ if "MSVC_VERSION" in ARGUMENTS :
+ env = Environment(ENV = env_ENV, variables = vars, MSVC_VERSION = ARGUMENTS["MSVC_VERSION"], platform = ARGUMENTS.get("PLATFORM", None))
diff --git a/swift/patches/patch-BuildTools_SCons_SConstruct b/swift/patches/patch-BuildTools_SCons_SConstruct
new file mode 100644
index 0000000..22c685e
--- /dev/null
+++ b/swift/patches/patch-BuildTools_SCons_SConstruct
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Don't strip environment so pkgsrc settings survive.
+
+--- BuildTools/SCons/SConstruct.orig 2016-07-20 22:17:03.000000000 +0000
++++ BuildTools/SCons/SConstruct
+@@ -266,7 +266,7 @@ if env.get("try_gconf", True) and env["P
+ gconf_env = conf_env.Clone()
+ conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG})
+ if conf.CheckPKG("gconf-2.0") :
+- gconf_bare_env = Environment()
++ gconf_bare_env = Environment(ENV=os.environ)
+ gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0')
+ gconf_flags = {
+ "LIBS": gconf_bare_env["LIBS"],
Home |
Main Index |
Thread Index |
Old Index