[arch-commits] Commit in (12 files)
Andrea Scarpino
andrea at archlinux.org
Fri Oct 29 12:17:05 UTC 2010
Date: Friday, October 29, 2010 @ 08:17:04
Author: andrea
Revision: 97325
renamed antlr to antlr2
Added:
amarok/trunk/fix-applet-size-on-startup.patch
antlr2/
antlr2/repos/
antlr2/trunk/
antlr2/trunk/PKGBUILD
antlr2/trunk/gcc4.4.patch
antlr2/trunk/runantlr2.sh
Modified:
amarok/trunk/PKGBUILD
amarok/trunk/scanning-qt-regression.patch
pyqt/trunk/PKGBUILD
sip/trunk/PKGBUILD
Deleted:
antlr/
-----------------------------------------------+
amarok/trunk/PKGBUILD | 14 ++-
amarok/trunk/fix-applet-size-on-startup.patch | 104 ++++++++++++++++++++++++
amarok/trunk/scanning-qt-regression.patch | 2
antlr2/trunk/PKGBUILD | 58 +++++++++++++
antlr2/trunk/gcc4.4.patch | 21 ++++
antlr2/trunk/runantlr2.sh | 5 +
pyqt/trunk/PKGBUILD | 7 -
sip/trunk/PKGBUILD | 6 -
8 files changed, 203 insertions(+), 14 deletions(-)
Modified: amarok/trunk/PKGBUILD
===================================================================
--- amarok/trunk/PKGBUILD 2010-10-29 11:10:29 UTC (rev 97324)
+++ amarok/trunk/PKGBUILD 2010-10-29 12:17:04 UTC (rev 97325)
@@ -5,7 +5,7 @@
pkgname=amarok
replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
pkgver=2.3.2
-pkgrel=2
+pkgrel=3
pkgdesc="A media player for KDE"
arch=("i686" "x86_64")
url="http://amarok.kde.org"
@@ -17,14 +17,18 @@
"loudmouth: backend needed by mp3tunes for syncing")
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
- 'scanning-qt-regression.patch')
+ 'scanning-qt-regression.patch'
+ 'fix-applet-size-on-startup.patch')
md5sums=('4e03dc009f8b44d9b8dfb5f6d1034081'
- 'a2effdfed3cf836c42264edbd2845441')
+ '4026759a6c753a5209e655cd4cc36bd8'
+ 'fdfe4947405fcfa58f273d34b41ddb32')
build() {
- # Already fixed upstream see:
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # Already fixed upstream
+ patch -Np1 -i ${srcdir}/fix-applet-size-on-startup.patch
# https://bugs.kde.org/show_bug.cgi?id=251762
- cd ${srcdir}/${pkgname}-${pkgver}
patch -Np1 -i ${srcdir}/scanning-qt-regression.patch
cd ${srcdir}
Added: amarok/trunk/fix-applet-size-on-startup.patch
===================================================================
--- amarok/trunk/fix-applet-size-on-startup.patch (rev 0)
+++ amarok/trunk/fix-applet-size-on-startup.patch 2010-10-29 12:17:04 UTC (rev 97325)
@@ -0,0 +1,104 @@
+From 7dbec1171386f182be77942ae43dc3684a96cfc4 Mon Sep 17 00:00:00 2001
+From: Mark Kretschmann <kretschmann at kde.org>
+Date: Sat, 2 Oct 2010 09:06:11 +0200
+Subject: [PATCH] Better workaround for wrong applet size on startup.
+
+This version also works in the case that Amarok was hidden to tray before
+starting, and it does not produce a jerking motion when starting in fullscreen
+mode.
+Thanks to Felix Geyer <debfx-pkg at fobos.de> for the idea.
+
+It might worth to include this patch in Amarok packages.
+
+CCMAIL: debfx-pkg at fobos.de
+CCMAIL: amarok-packagers at googlegroups.com
+---
+ src/App.cpp | 12 ------------
+ src/App.h | 1 -
+ src/MainWindow.cpp | 17 +++++++++++++++++
+ src/MainWindow.h | 1 +
+ 4 files changed, 18 insertions(+), 13 deletions(-)
+
+diff --git a/src/App.cpp b/src/App.cpp
+index cd0efa3..507cf21 100644
+--- a/src/App.cpp
++++ b/src/App.cpp
+@@ -790,18 +790,6 @@ App::continueInit()
+ aUrl.run();
+ }
+ s_delayedAmarokUrls.clear();
+-
+- QTimer::singleShot( 1500, this, SLOT( resizeMainWindow() ) );
+-}
+-
+-
+-void App::resizeMainWindow() // SLOT
+-{
+- // HACK
+- // This code works around a bug in KDE 4.5, which causes our Plasma applets to show
+- // with a wrong initial size. Remove when this bug is fixed in Plasma.
+- m_mainWindow->resize( m_mainWindow->width(), m_mainWindow->height() - 1 );
+- m_mainWindow->resize( m_mainWindow->width(), m_mainWindow->height() + 1 );
+ }
+
+
+diff --git a/src/App.h b/src/App.h
+index 9c05eea..5866aa2 100644
+--- a/src/App.h
++++ b/src/App.h
+@@ -83,7 +83,6 @@ class AMAROK_EXPORT App : public KUniqueApplication
+
+ private slots:
+ void continueInit();
+- void resizeMainWindow();
+
+ public slots:
+ void applySettings( bool firstTime = false );
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index 9a2c194..54c6751 100644
+--- a/src/MainWindow.cpp
++++ b/src/MainWindow.cpp
+@@ -506,6 +506,13 @@ MainWindow::showEvent(QShowEvent* e)
+ if (!m_layoutEverRestored)
+ restoreLayout();
+
++ static bool windowEverShown = false;
++ if ( !windowEverShown )
++ {
++ windowEverShown = true;
++ QTimer::singleShot( 250, this, SLOT( resizeWindowHack() ) );
++ }
++
+ QWidget::showEvent(e);
+ }
+
+@@ -1704,4 +1711,14 @@ MainWindow::isWaitingForCd() const
+ return m_waitingForCd;
+ }
+
++void
++MainWindow::resizeWindowHack()
++{
++ // HACK
++ // This code works around a bug in KDE 4.5, which causes our Plasma applets to show
++ // with a wrong initial size. Remove when this bug is fixed in Plasma.
++ resize( width(), height() - 1 );
++ resize( width(), height() + 1 );
++}
++
+ #include "MainWindow.moc"
+diff --git a/src/MainWindow.h b/src/MainWindow.h
+index e6ae0b3..b86470e 100644
+--- a/src/MainWindow.h
++++ b/src/MainWindow.h
+@@ -148,6 +148,7 @@ class AMAROK_EXPORT MainWindow : public KMainWindow, public Engine::EngineObserv
+ void slotAddStream();
+ void slotJumpTo();
+ void showScriptSelector();
++ void resizeWindowHack();
+ #ifdef DEBUG_BUILD_TYPE
+ void showNetworkRequestViewer();
+ #endif // DEBUG_BUILD_TYPE
+--
+1.7.3.2
+
Modified: amarok/trunk/scanning-qt-regression.patch
===================================================================
--- amarok/trunk/scanning-qt-regression.patch 2010-10-29 11:10:29 UTC (rev 97324)
+++ amarok/trunk/scanning-qt-regression.patch 2010-10-29 12:17:04 UTC (rev 97325)
@@ -50,7 +50,7 @@
+ if( data[i].category() == QChar::NoCategory ||
+ data[i].category() == QChar::Other_Surrogate ||
+ (
-+ data[i].unicode() < 20 &&
++ data[i].unicode() < 32 &&
+ data[i].unicode() != 9 &&
+ data[i].unicode() != 10 &&
+ data[i].unicode() != 13
Added: antlr2/trunk/PKGBUILD
===================================================================
--- antlr2/trunk/PKGBUILD (rev 0)
+++ antlr2/trunk/PKGBUILD 2010-10-29 12:17:04 UTC (rev 97325)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: George Giorgidze <giorgidze (at) gmail.com>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+
+pkgbase=antlr2
+pkgname=('antlr2' 'python-antlr2')
+pkgver=2.7.7
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.antlr2.org/"
+license=('custom')
+makedepends=('java-environment' 'python2' 'sh')
+source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
+ 'runantlr2.sh'
+ 'gcc4.4.patch')
+md5sums=('01cc9a2a454dd33dcd8c856ec89af090'
+ 'e4aa827cf78f97c4e5fae086831192d6'
+ '8574c93f40e6477e83c29f9b07de49da')
+
+build() {
+ cd "${srcdir}/antlr-${pkgver}"
+
+ patch -Np0 -i ${srcdir}/gcc4.4.patch
+
+ ./configure --prefix=/usr \
+ --disable-examples \
+ --disable-csharp
+ make
+}
+
+package_antlr2() {
+ pkgdesc="ANother Tool for Language Recognition, (formerly PCCTS) is a language tool that provides a framework for constructing recognizers, compilers, and translators from grammatical descriptions containing C++ or Java actions"
+ depends=('java-runtime' 'sh')
+ replaces=('antlr')
+ conflicts=('antlr')
+ provides=("antlr=${pkgver}")
+
+ cd ${srcdir}/antlr-${pkgver}/lib/cpp
+ make prefix="${pkgdir}/usr" install
+
+ install -Dm644 ${srcdir}/antlr-${pkgver}/antlr/antlr.jar \
+ "${pkgdir}/usr/share/java/antlr2.jar"
+ install -Dm755 ${srcdir}/runantlr2.sh ${pkgdir}/usr/bin/runantlr2
+ install -Dm644 ${srcdir}/antlr-${pkgver}/LICENSE.txt \
+ "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python-antlr2() {
+ pkgdesc="ANother Tool for Language Recognition, (formerly PCCTS) is a language tool that provides a framework for constructing recognizers, compilers, and translators from grammatical descriptions containing C++ or Java actions (Python version)"
+ depends=('antlr2' 'python2')
+ replaces=('python-antlr')
+ conflicts=('python-antlr')
+ provides=("python-antlr=${pkgver}")
+
+ cd ${srcdir}/antlr-${pkgver}/lib/python
+ python2 setup.py install --root="${pkgdir}" --optimize=1
+}
Added: antlr2/trunk/gcc4.4.patch
===================================================================
--- antlr2/trunk/gcc4.4.patch (rev 0)
+++ antlr2/trunk/gcc4.4.patch 2010-10-29 12:17:04 UTC (rev 97325)
@@ -0,0 +1,21 @@
+diff -Naur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp
+--- lib/cpp/antlr/CharScanner.hpp 2006-11-01 22:37:17.000000000 +0100
++++ lib/cpp/antlr/CharScanner.hpp 2008-03-19 20:09:21.000000000 +0100
+@@ -10,6 +10,7 @@
+
+ #include <antlr/config.hpp>
+
++#include <cstring>
+ #include <map>
+
+ #ifdef HAS_NOT_CCTYPE_H
+--- lib/cpp/antlr/CharScanner.hpp~ 2008-11-11 21:24:02.000000000 +0000
++++ lib/cpp/antlr/CharScanner.hpp 2008-11-11 21:24:33.000000000 +0000
+@@ -10,6 +10,7 @@
+
+ #include <antlr/config.hpp>
+
++#include <cstdio>
+ #include <cstring>
+ #include <map>
+
Added: antlr2/trunk/runantlr2.sh
===================================================================
--- antlr2/trunk/runantlr2.sh (rev 0)
+++ antlr2/trunk/runantlr2.sh 2010-10-29 12:17:04 UTC (rev 97325)
@@ -0,0 +1,5 @@
+#!/bin/sh
+echo Running 'java antlr.Tool $*' with /usr/share/java/antlr2.jar appended to the CLASSPATH variable
+export CLASSPATH
+CLASSPATH=$CLASSPATH:/usr/share/java/antlr2.jar
+java antlr.Tool $*
Modified: pyqt/trunk/PKGBUILD
===================================================================
--- pyqt/trunk/PKGBUILD 2010-10-29 11:10:29 UTC (rev 97324)
+++ pyqt/trunk/PKGBUILD 2010-10-29 12:17:04 UTC (rev 97325)
@@ -6,7 +6,7 @@
pkgname=pyqt
pkgver=4.8.0
_pkgver=4.8
-pkgrel=1
+pkgrel=2
pkgdesc="A set of Python bindings for the Qt toolkit"
arch=('i686' 'x86_64')
url="http://riverbankcomputing.co.uk/software/pyqt/intro"
@@ -17,16 +17,13 @@
'python-opengl: enable OpenGL 3D graphics in PyQt applications'
'qscintilla: QScintilla API'
'qt-assistant-compat: add PyQt online help in Qt Assistant')
-provides=('pyqt4')
-replaces=('pyqt4')
-conflicts=('pyqt4')
source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${_pkgver}.tar.gz")
md5sums=('003d195498eb42ca2daf7615fa01488d')
build() {
cd ${srcdir}/PyQt-x11-gpl-${_pkgver}
- python2 configure.py \
+ python configure.py \
--confirm-license \
-v /usr/share/sip \
--qsci-api
Modified: sip/trunk/PKGBUILD
===================================================================
--- sip/trunk/PKGBUILD 2010-10-29 11:10:29 UTC (rev 97324)
+++ sip/trunk/PKGBUILD 2010-10-29 12:17:04 UTC (rev 97325)
@@ -5,19 +5,19 @@
pkgname=sip
pkgver=4.11.2
-pkgrel=1
+pkgrel=2
pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
arch=('i686' 'x86_64')
url="http://www.riverbankcomputing.com/software/sip/"
license=('custom:"sip"')
-depends=('python2' 'gcc-libs')
+depends=('python' 'gcc-libs')
source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgname}-${pkgver}.tar.gz")
md5sums=('d799804ca0a88bd76c6c2cdf8935c3cb')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- python2 configure.py
+ python configure.py
make
}
More information about the arch-commits
mailing list