diff --git a/bitcoin/PKGBUILD b/bitcoin/PKGBUILD index 0ef7c15bf..d3f171d62 100644 --- a/bitcoin/PKGBUILD +++ b/bitcoin/PKGBUILD @@ -7,9 +7,9 @@ pkgname=bitcoin pkgver=0.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="Bitcoin is a peer-to-peer network based digital currency." -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.bitcoin.org/" depends=('qt' 'libpng' 'expat' 'gcc-libs' 'boost-libs' 'miniupnpc' 'openssl') makedepends=('boost' 'gcc' 'make' 'automoc4') diff --git a/qupzilla/PKGBUILD b/qupzilla/PKGBUILD index d5ef94d82..e6e81483d 100644 --- a/qupzilla/PKGBUILD +++ b/qupzilla/PKGBUILD @@ -1,26 +1,45 @@ # Contributor: Neophytos Kolokotronis +# Contributor: Fabian Kosmale <0inkane@googlemail.com> pkgname=qupzilla -pkgver=1.0.1 -pkgrel=4 +pkgver=1.3.5 +pkgrel=2 +_commit=e59241f pkgdesc="A very fast open source browser based on WebKit core" -url="http://qt-apps.org/content/show.php?content=145693" -arch=('i686' 'x86_64') +url="http://www.qupzilla.com" +arch=('x86_64') license=('GPL3') -depends=('qt') -categories=('network') -source=(https://github.com/nowrep/QupZilla/zipball/master) -md5sums=('7d397c6804d0a5147c8ac26f4dea9017') +depends=('qt' 'qtwebkit') +categories=('network') +source=("https://github.com/downloads/QupZilla/qupzilla/QupZilla-${pkgver}.tar.gz" + #"https://github.com/QupZilla/QupZilla/tarball/master/QupZilla-qupzilla-${pkgver}.tar.gz" + 'searchenginesmanager.diff' + 'speeddial.diff' + 'preferences.diff' + 'qupzilla.diff' + 'start-white.png') +md5sums=('b2ecf689d45af384c4557895dc43f4da' + '7e1b3743fba94b54ab0858e7588cca83' + 'b58d03f2e52ea3391e63c0eeea3e82a4' + 'ac98b9f9cc45df18070eabee518c0049' + 'fc0aa2bef51e5488f129b4618ee18545' + 'fc705d7aba952361a626a2c79726bbfa') build() { - cd $srcdir/nowrep-QupZilla-e24b4d3/src/ + cd "${srcdir}/QupZilla-${pkgver}/" + patch -p0 -i "${srcdir}/searchenginesmanager.diff" + patch -p0 -i "${srcdir}/speeddial.diff" + patch -p0 -i "${srcdir}/preferences.diff" + patch -p0 -i "${srcdir}/qupzilla.diff" export USE_WEBGL="true" + export KDE="true" qmake QupZilla.pro make } package() { - cd $srcdir/nowrep-QupZilla-e24b4d3/src/ + cd "${srcdir}/QupZilla-${pkgver}/" + mkdir -p ${pkgdir}/usr/share/icons + install -m 644 -p ${srcdir}/start-white.png ${pkgdir}/usr/share/icons/ make INSTALL_ROOT=$pkgdir install - -} \ No newline at end of file +} diff --git a/qupzilla/preferences.diff b/qupzilla/preferences.diff new file mode 100644 index 000000000..8174b655d --- /dev/null +++ b/qupzilla/preferences.diff @@ -0,0 +1,20 @@ +--- src/lib/preferences/preferences.cpp 2012-03-23 16:29:12.000000000 +0000 ++++ src/lib/preferences/preferences.cpp 2012-03-23 13:42:51.095598055 +0000 +@@ -94,7 +94,7 @@ + Settings settings; + //GENERAL URLs + settings.beginGroup("Web-URL-Settings"); +- m_homepage = settings.value("homepage", "qupzilla:start").toString(); ++ m_homepage = settings.value("homepage", "http://www.chakra-linux.org/welcome.html").toString(); + m_newTabUrl = settings.value("newTabUrl", "qupzilla:speeddial").toString(); + ui->homepage->setText(m_homepage); + ui->newTabUrl->setText(m_newTabUrl); +@@ -150,7 +150,7 @@ + //APPEREANCE + m_themesManager = new ThemeManager(ui->themesWidget, this); + settings.beginGroup("Browser-View-Settings"); +- ui->showStatusbar->setChecked(settings.value("showStatusBar", true).toBool()); ++ ui->showStatusbar->setChecked(settings.value("showStatusBar", false).toBool()); + ui->showBookmarksToolbar->setChecked(p_QupZilla->bookmarksToolbar()->isVisible()); + ui->showNavigationToolbar->setChecked(p_QupZilla->navigationBar()->isVisible()); + ui->showHome->setChecked(settings.value("showHomeButton", true).toBool()); diff --git a/qupzilla/qupzilla.diff b/qupzilla/qupzilla.diff new file mode 100644 index 000000000..5a0712707 --- /dev/null +++ b/qupzilla/qupzilla.diff @@ -0,0 +1,20 @@ +--- src/lib/app/qupzilla.cpp.orig 2012-03-05 08:33:24.000000000 -0500 ++++ src/lib/app/qupzilla.cpp 2012-03-05 14:33:05.027117810 -0500 +@@ -549,7 +549,7 @@ + + //Url settings + settings.beginGroup("Web-URL-Settings"); +- m_homepage = settings.value("homepage", "qupzilla:start").toUrl(); ++ m_homepage = settings.value("homepage", "http://www.chakra-linux.org/welcome.html").toUrl(); + settings.endGroup(); + + QWebSettings* websettings = mApp->webSettings(); +@@ -563,7 +563,7 @@ + bool showBackForwardIcons = settings.value("showBackForwardButtons", true).toBool(); + bool showBookmarksToolbar = settings.value("showBookmarksToolbar", true).toBool(); + bool showNavigationToolbar = settings.value("showNavigationToolbar", true).toBool(); +- bool showMenuBar = settings.value("showMenubar", true).toBool(); ++ bool showMenuBar = settings.value("showMenubar", false).toBool(); + bool showAddTab = settings.value("showAddTabButton", false).toBool(); + bool makeTransparent = settings.value("useTransparentBackground", false).toBool(); + m_sideBarWidth = settings.value("SideBarWidth", 250).toInt(); diff --git a/qupzilla/searchenginesmanager.diff b/qupzilla/searchenginesmanager.diff new file mode 100644 index 000000000..1a7c9ffc5 --- /dev/null +++ b/qupzilla/searchenginesmanager.diff @@ -0,0 +1,22 @@ +--- src/lib/opensearch/searchenginesmanager.cpp.orig 2012-07-11 12:37:18.000000000 -0400 ++++ src/lib/opensearch/searchenginesmanager.cpp 2012-07-11 22:34:37.935484692 -0400 +@@ -50,7 +50,7 @@ + { + Settings settings; + settings.beginGroup("SearchEngines"); +- m_startingEngineName = settings.value("activeEngine", "Google").toString(); ++ m_startingEngineName = settings.value("activeEngine", "DuckDuckGo").toString(); + settings.endGroup(); + + connect(this, SIGNAL(enginesChanged()), this, SLOT(scheduleSave())); + + m_allEngines.append(en); +@@ -141,7 +141,7 @@ + Engine duck; + duck.name = "DuckDuckGo"; + duck.icon = QIcon(":/icons/sites/duck.png"); +- duck.url = "https://duckduckgo.com/?q=%s&t=qupzilla"; ++ duck.url = "https://duckduckgo.com/?t=chakra&q=%s"; + duck.shortcut = "d"; + + addEngine(google); diff --git a/qupzilla/speeddial.diff b/qupzilla/speeddial.diff new file mode 100644 index 000000000..c410ce7d7 --- /dev/null +++ b/qupzilla/speeddial.diff @@ -0,0 +1,29 @@ +--- src/lib/plugins/speeddial.cpp 2012-09-17 12:03:30.000000000 -0400 ++++ src/lib/plugins/speeddial.cpp 2012-09-17 15:51:19.070088443 -0400 +@@ -46,19 +46,18 @@ + Settings settings; + settings.beginGroup("SpeedDial"); + QString allPages = settings.value("pages", QString()).toString(); +- m_backgroundImage = settings.value("background", QString()).toString(); +- m_backgroundImageSize = settings.value("backsize", "auto").toString(); ++ m_backgroundImage = settings.value("background", "file:///usr/share/icons/start-white.png").toString(); ++ m_backgroundImageSize = settings.value("backsize", "contain").toString(); + m_maxPagesInRow = settings.value("pagesrow", 4).toInt(); +- m_sizeOfSpeedDials = settings.value("sdsize", 231).toInt(); ++ m_sizeOfSpeedDials = settings.value("sdsize", 150).toInt(); + m_sdcentered = settings.value("sdcenter", 0).toInt(); + settings.endGroup(); + + if (allPages.isEmpty()) { +- allPages = "url:\"http://www.google.com\"|title:\"Google\";" +- "url:\"http://www.qupzilla.com\"|title:\"QupZilla\";" +- "url:\"http://blog.qupzilla.com\"|title:\"QupZilla Blog\";" +- "url:\"https://github.com/QupZilla/qupzilla\"|title:\"QupZilla GitHub\";" +- "url:\"https://facebook.com\"|title:\"Facebook\";"; ++ allPages = "url:\"http://www.chakra-linux.org\"|title:\"The Chakra Project - Welcome\";" ++ "url:\"http://www.chakra-project.org/bbs\"|title:\"Forums\";" ++ "url:\"http://webchat.freenode.net/?channels=chakra\"|title:\"IRC\";" ++ "url:\"http://www.youtube.com/html5\"|title:\"YouTube-html5\";"; + } + changed(allPages); + diff --git a/qupzilla/start-white.png b/qupzilla/start-white.png new file mode 100644 index 000000000..674e68067 Binary files /dev/null and b/qupzilla/start-white.png differ diff --git a/rekonq-git/PKGBUILD b/rekonq-git/PKGBUILD index 7e955ee23..450dd05bc 100755 --- a/rekonq-git/PKGBUILD +++ b/rekonq-git/PKGBUILD @@ -1,35 +1,32 @@ # # KDE SC Packages for Chakra, part of chakra-project.org # -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf +# maintainer abveritas[at]chakra-project[dot]org> pkgname=rekonq-git -pkgver=20111010 +pkgver=20121102 pkgrel=1 pkgdesc="rekonq is a KDE web browser based on QtWebKit." arch=('i686' 'x86_64') url="http://rekonq.sourceforge.net/" license=('GPL') groups=() -depends=('kde-baseapps' 'qt') +depends=('kde-baseapps' 'qoauth' 'qca-ossl') makedepends=('gcc' 'cmake' 'automoc4' 'git' 'docbook-xsl' 'bc') -categories=('network') provides=(rekonq) conflicts=(rekonq) replaces=() backup=() options=() -source=(rekonq-git.install patch) +source=('background.png' + 'background.diff') +md5sums=('cd493df91e34030a8195eaf8b6d68140' + '5d7bab51b8f4b78c0f7cd94c885f22c3') noextract=() -md5sums=('c354917df476f6ddfec82d0ccf7dfd85' - '86515d857298456cb34d60588ae2311c') +#md5sums=('c354917df476f6ddfec82d0ccf7dfd85') -_gitroot="git://anongit.kde.org/rekonq.git" -_gitname="rekonq" +_gitroot="git://anongit.kde.org/scratch/adjam/rekonq2.git" +_gitname="rekonq2" build() { @@ -50,9 +47,6 @@ build() { rm -rf ${srcdir}/build git clone ${srcdir}/${_gitname} ${srcdir}/build cd ${srcdir}/build - - # patch and run localization files - patch -Np1 -i ${srcdir}/patch export RK_SRCS="${srcdir}/build" cd scripts @@ -60,14 +54,19 @@ build() { ./download_i18n.sh cd .. # end path and run localization files - + + patch -p1 -i "${srcdir}/background.diff" + cmake . -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_WEBGL=ON + -DCMAKE_INSTALL_PREFIX=/usr + make } package() { cd ${srcdir}/build make DESTDIR=${pkgdir} install + + rm ${pkgdir}/usr/share/apps/rekonq/pics/background.png + install -m 644 -p ${srcdir}/background.png ${pkgdir}/usr/share/apps/rekonq/pics/background.png } diff --git a/rekonq-git/patch b/rekonq-git/patch deleted file mode 100644 index c0060cd89..000000000 --- a/rekonq-git/patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur mainline/CMakeLists.txt mainline.new/CMakeLists.txt ---- mainline/CMakeLists.txt 2010-09-25 01:10:20.000000000 -0500 -+++ mainline.new/CMakeLists.txt 2010-09-25 01:22:18.000000000 -0500 -@@ -95,7 +95,7 @@ - ADD_SUBDIRECTORY( src ) - ADD_SUBDIRECTORY( icons ) - ADD_SUBDIRECTORY( docs ) --# ADD_SUBDIRECTORY( i18n ) -+ ADD_SUBDIRECTORY( i18n ) - - ENDIF(REKONQ_CAN_BE_COMPILED) - -diff -Naur mainline/scripts/download_i18n.sh mainline.new/scripts/download_i18n.sh ---- mainline/scripts/download_i18n.sh 2010-09-25 01:10:20.000000000 -0500 -+++ mainline.new/scripts/download_i18n.sh 2010-09-25 01:18:10.000000000 -0500 -@@ -9,7 +9,7 @@ - # 2. run this script. It will create an i18n dir in rekonq sources ($RK_SRCS variable, set it to your source path) - # dir with all the listed translations (eg: italian translation = rekonq_it.po file) - # plus the CMakeLists.txt file needed to compile them. --RK_SRCS=/DATI/KDE/SRC/rekonq -+#RK_SRCS=/DATI/KDE/SRC/rekonq - - # 3. Uncomment the "ADD_SUBDIRECTORY( i18n )" line in main CMakeLists.txt file. diff --git a/rekonq/PKGBUILD b/rekonq/PKGBUILD index 956407497..b922061f4 100644 --- a/rekonq/PKGBUILD +++ b/rekonq/PKGBUILD @@ -4,10 +4,10 @@ # maintainer: abveritas@chakra-project.org pkgname=rekonq -pkgver=1.0 -pkgrel=5 +pkgver=1.3 +pkgrel=2 pkgdesc='A WebKit based web browser for KDE' -arch=('i686' 'x86_64') +arch=('x86_64') url='http://rekonq.sourceforge.net/' license=('GPL') depends=('kde-baseapps' 'qoauth' 'qca-ossl') @@ -19,7 +19,7 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz 'background.png' 'background.diff' 'searchengine.diff') -md5sums=('ca7b86ad4a778cbba52a14192865c7b0' +md5sums=('aeed67e546bf83006a09944d6bb8e920' 'cd493df91e34030a8195eaf8b6d68140' '5d7bab51b8f4b78c0f7cd94c885f22c3' '7ab9dc2e4397a66c7a64e08265171996') @@ -28,8 +28,8 @@ build(){ cd ${srcdir}/${pkgname}-${pkgver} # Chakra theme: patch -p1 -i "${srcdir}/background.diff" - # Default search bug - patch -p1 -i "${srcdir}/searchengine.diff" + # Default search bug (not an issue for kde 4.8) + #patch -p1 -i "${srcdir}/searchengine.diff" cd ${srcdir} mkdir -p build