Skip to content

Commit

Permalink
calamares build for bootldr fix
Browse files Browse the repository at this point in the history
updated rls notes
go 1.8
qgis latest checkout & previous fail with new sip
qjson 0.9.0, remove obsolete qjson-qt5
  • Loading branch information
demmm committed Feb 17, 2017
1 parent 8b774ad commit 35f93c4
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 52 deletions.
6 changes: 3 additions & 3 deletions calamares/PKGBUILD
@@ -1,7 +1,7 @@

pkgname=calamares
pkgver=3.0.90
pkgrel=2
pkgver=3.0.91
pkgrel=1
pkgdesc='Distribution-independent installer framework'
arch=('x86_64')
url='http://calamares.io/'
Expand All @@ -27,7 +27,7 @@ md5sums=('SKIP'
'8b69a3a86923e2ee67a5a0725acb93e6'
'fc92a5a0a1276a8e8f1a3327a0e567ee'
'bb33b54d289cfe39ebfd78f172382880'
'db67887a4f83565938f04f87686f0c0e')
'3cd1a3337cedd5236e6a8a6a09ed6426')

prepare () {
cd ${pkgname}
Expand Down
4 changes: 2 additions & 2 deletions calamares/release_notes.html
Expand Up @@ -25,7 +25,7 @@ <h3>KaOS - 2017.02</h3>

<p>KaOS uses a First Run Wizard. It will run on the newly installed system and enables with just a few clicks to adjust mouse behavior, menu launcher, desktop theme, used wallpaper, color scheme, widget style, window decoration and virtual desktops used. With one click this Wizard will also link to KaOS Documentation and all contact info.</p>

<p>Most notable major updates to the base of the system are Qt 5.8.0, Readline 7.0, Bash 4.4 Perl 5.24.1, Systemd 232, Xorg-Server 1.19.1, Linux 4.9.10, Mesa 13.0.3, Protobuf 3.2.0, Libwebp 0.6.0, Gstreamer 1.10.3 and a move to qtwebkit-tp replacing no longer maintained qt5-webkit</p>
<p>Most notable major updates to the base of the system are Qt 5.8.0, Readline 7.0, Bash 4.4 Perl 5.24.1, Systemd 232, Xorg-Server 1.19.1, Linux 4.9.10, Glibc 2.25, GCC 5.4.1, Binutils 2.27 Protobuf 3.2.0, Libwebp 0.6.0, Gstreamer 1.10.3 and a move to qtwebkit-tp replacing no longer maintained qt5-webkit</p>

<p>KaOS repositories no longer provide Qt 4. It is a good three years ago that development for Qt 4 stopped, late 2015 all support including security fixes ended. Any application that has not made the transition to Qt 5 in all this time can no longer be supported in KaOS. Either they actually are no longer maintained or their development is ignoring the implications of building on a possible insecure toolkit.</p>

Expand Down Expand Up @@ -53,7 +53,7 @@ <h3>KaOS - 2017.02</h3>

<p>To avoid any misunderstanding and confusion, KaOS is <b>not based upon, derived of, or inspired by</b> any one particular distribution. It is completely independent, build entirely from scratch with its own repositories. To read more about this see <b>http://kaosx.us/about/based/</b>. A <b>rolling release distribution</b> never has a "final" release, every ISO is mere a snapshot of the current status of the repositories. An idea what is currently available:</p>

<p>The ISO ships with <b>Frameworks 5.31.0, Plasma 5.9.2, KDE Applications 16.12.2 &amp; not yet released ports of KDE Applications</b>, Linux 4.9.10, Systemd 232, Kmod 23, NetworkManager 1.6.0, Calligra 3.0.0.1, Krita 3.1.2, Cantata, Plasma-nm 5.9.2, Xorg-Server 1.19.1, Mesa 13.0.3, Glibc 2.23, GCC 5.4.0, non-free Nvidia 375.26, Pepperflash and Python3 3.5.3 to name a few.</p>
<p>The ISO ships with <b>Frameworks 5.31.0, Plasma 5.9.2, KDE Applications 16.12.2 &amp; not yet released ports of KDE Applications</b>, Linux 4.9.10, Systemd 232, Kmod 23, NetworkManager 1.6.2, Calligra 3.0.0.1, Krita 3.1.2, Cantata, Plasma-nm 5.9.2, Xorg-Server 1.19.1, Mesa 13.0.3, Glibc 2.25, GCC 5.4.1, non-free Nvidia 375.37, Pepperflash and Python3 3.5.3 to name a few.</p>

<p>The package manager is <strong>Pacman 5.0.1</strong>, with the simple but powerful Octopi 0.9dev as GUI frontend. Default web browser is Qt based Qupzilla 2.1.0. <b>GFXboot</b> is included with KaOS artwork, Grub theme is Midna, Look &amp; Feel is a KaOS exclusive version "Midna", fully redone for 2016.</p>

Expand Down
4 changes: 2 additions & 2 deletions go/PKGBUILD
@@ -1,6 +1,6 @@

pkgname=go
pkgver=1.7.5
pkgver=1.8
pkgrel=1
pkgdesc='Google Go compiler and tools (release version)'
arch=('x86_64')
Expand All @@ -12,7 +12,7 @@ options=('!strip' 'staticlibs')
install="${pkgname}.install"
# check for versions: http://golang.org/dl/
source=("https://storage.googleapis.com/golang/${pkgname}${pkgver}.linux-amd64.tar.gz")
md5sums=('c8cb76e2308c792e2705c2eb1b55de95')
md5sums=('d0f6de92ccef6489a0d9b8efbb8f577f')

build() {
cd go/src
Expand Down
15 changes: 5 additions & 10 deletions qgis/PKGBUILD
@@ -1,8 +1,8 @@

pkgname=qgis
_pkgname=QGIS
pkgver=2.90.1
_commit=958dff9d825a356d131e3037d4ecfb66886c7edc
pkgver=2.90.2
_commit=7d2d6e89ba44cebdd5e376f26fa8f1c7438ef306
pkgrel=1
pkgdesc='Quantum GIS is a Geographic Information System (GIS) that supports vector, raster & database formats'
url='http://qgis.org/'
Expand All @@ -11,11 +11,11 @@ arch=('x86_64')
depends=('libmariadbclient' 'postgresql-libs' 'sqlite' 'jasper' 'curl' 'python2' 'giflib' 'gsl' 'grass'
'cfitsio' 'qwt' 'proj' 'gdal' 'geos' 'libspatialite' 'spatialindex' 'python3-qscintilla-qt5'
'postgis' 'fcgi' 'qt5-svg' 'qt5-script' 'python3-six' 'python3-psycopg2' 'python3-dateutil'
'python3-pytz' 'python3-jinja' 'python3-future' 'pyqt5-python3' 'qca-qt5') # 'qtwebkit-tp'
'python3-pytz' 'python3-jinja' 'python3-future' 'pyqt5-python3' 'qca-qt5' 'qtwebkit-tp'
'python3-gdal' 'python3-numpy' 'python3-httplib2' 'python3-requests' 'qjson')
makedepends=('cmake' 'netcdf' 'sip3' 'qt5-tools')
source=("https://github.com/qgis/QGIS/archive/${_commit}.zip")
md5sums=('a1c9195a9755a9520b44650e87195185')
md5sums=('4781d345be1c926ae194b4a0abb9e293')

prepare() {
cd ${_pkgname}-${_commit}
Expand All @@ -25,11 +25,6 @@ prepare() {
sed -i -e 's|libqt5scintilla2|libqtscintilla2|' cmake/FindQScintilla.cmake

sed -i 's/\(env \|\/usr\/bin\/\)python$/&3/' $(find . -iname "*.py")

# fix build with qtwebkit-tp
#sed -i -e 's|<QWebPage>|<QtWebKitWidgets/QWebPage>|' src/core/qgswebpage.h
#sed -i -e 's|<QWebFrame>|<QtWebKitWidgets/QWebFrame>|' src/core/qgswebframe.h
#sed -i -e 's|<QWebView>|<QtWebKitWidgets/QWebView>|' src/core/qgswebview.h
}

build() {
Expand All @@ -52,7 +47,7 @@ prepare() {
-DWITH_INTERNAL_NOSE2=FALSE \
-DWITH_INTERNAL_PYTZ=FALSE \
-DWITH_QWTPOLAR=FALSE \
-DWITH_QTWEBKIT=FALSE
-DWITH_QTWEBKIT=TRUE

make
}
Expand Down
32 changes: 0 additions & 32 deletions qjson-qt5/PKGBUILD

This file was deleted.

6 changes: 3 additions & 3 deletions qjson/PKGBUILD
@@ -1,7 +1,7 @@

pkgname=qjson
pkgver=0.8.1.2
_commit=5e3b9b84b225f4612e09ef05aa6d8c23379e4e71
pkgver=0.9.0
_commit=eee8a1626f18499a95a5216dd1832f45c15a46ba
pkgrel=1
pkgdesc="A qt-based library that maps JSON data to QVariant objects."
arch=('x86_64')
Expand All @@ -13,7 +13,7 @@ provides=('qjson-qt5')
conflicts=('qjson-qt5')
replaces=('qjson-qt5')
source=("https://github.com/flavio/qjson/archive/${_commit}.zip")
md5sums=('22797164d5abe7c133114c0ed16d19ce')
md5sums=('8252d203dc2376b760283ec685ae145c')


build() {
Expand Down

0 comments on commit 35f93c4

Please sign in to comment.