From 211709a2f09bd677aa1deac0dc82fde6ce1c8626 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 2 Jun 2012 00:01:53 +0000 Subject: Sat Jun 2 00:01:53 UTC 2012 --- kde-unstable/kactivities/PKGBUILD | 6 +- kde-unstable/kdebase-runtime/PKGBUILD | 9 +- kde-unstable/kdebindings-perlqt/PKGBUILD | 2 +- kde-unstable/kdebindings-python/PKGBUILD | 6 +- kde-unstable/kdebindings-smokegen/PKGBUILD | 6 +- kde-unstable/kdebindings-smokeqt/PKGBUILD | 6 +- kde-unstable/kdepim-runtime/PKGBUILD | 15 +- kde-unstable/kdepim-runtime/libkgapi.patch | 1742 ++++++++++++++++++++++++++++ kde-unstable/kdepimlibs/PKGBUILD | 6 +- kde-unstable/kdesdk-kate/PKGBUILD | 6 +- kde-unstable/libkgapi/PKGBUILD | 31 + kde-unstable/nepomuk-core/PKGBUILD | 9 +- 12 files changed, 1808 insertions(+), 36 deletions(-) create mode 100644 kde-unstable/kdepim-runtime/libkgapi.patch create mode 100644 kde-unstable/libkgapi/PKGBUILD (limited to 'kde-unstable') diff --git a/kde-unstable/kactivities/PKGBUILD b/kde-unstable/kactivities/PKGBUILD index 576f83981..899c9ae26 100644 --- a/kde-unstable/kactivities/PKGBUILD +++ b/kde-unstable/kactivities/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160080 2012-05-29 22:12:47Z andrea $ +# $Id: PKGBUILD 160317 2012-05-31 22:19:26Z andrea $ # Maintainer: Andrea Scarpino pkgname=kactivities pkgver=4.8.80 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc='API for using and interacting with the Activity Manager' url='https://projects.kde.org/projects/kde/kdelibs/kactivities' @@ -11,7 +11,7 @@ license=('GPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('e98929eff9d8c4102bc643cf44a06d28646ff8ce') +sha1sums=('1283527b0432e3e0f554775b077104e696995a3d') build() { cd "${srcdir}" diff --git a/kde-unstable/kdebase-runtime/PKGBUILD b/kde-unstable/kdebase-runtime/PKGBUILD index a05f08eda..cb664c361 100644 --- a/kde-unstable/kdebase-runtime/PKGBUILD +++ b/kde-unstable/kdebase-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160082 2012-05-29 22:21:05Z andrea $ +# $Id: PKGBUILD 160318 2012-05-31 22:19:54Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-runtime pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins and applications necessary for the running of KDE applications" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kde-runtime' @@ -17,7 +17,7 @@ optdepends=('htdig: to build the search index in khelpcenter' 'gdb: drkonq crash handler') install="${pkgname}.install" source=("http://download.kde.org/unstable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz") -sha1sums=('2ef106862e33a8fc2b936a875ab87e581d25d2ee') +sha1sums=('c191073f5731ea2cb585a4fdfb3318b2a4f55154') build() { cd "${srcdir}" @@ -38,7 +38,4 @@ package() { rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme" ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" - - # Fix conflict - rm "${pkgdir}"/usr/lib/libnepomukcommon.so } diff --git a/kde-unstable/kdebindings-perlqt/PKGBUILD b/kde-unstable/kdebindings-perlqt/PKGBUILD index fa27f08c5..a419c0465 100644 --- a/kde-unstable/kdebindings-perlqt/PKGBUILD +++ b/kde-unstable/kdebindings-perlqt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160184 2012-05-30 07:32:36Z andrea $ +# $Id: PKGBUILD 160323 2012-05-31 22:23:31Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-perlqt diff --git a/kde-unstable/kdebindings-python/PKGBUILD b/kde-unstable/kdebindings-python/PKGBUILD index f1b22222f..2cad5573a 100644 --- a/kde-unstable/kdebindings-python/PKGBUILD +++ b/kde-unstable/kdebindings-python/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 160090 2012-05-29 22:25:25Z andrea $ +# $Id: PKGBUILD 160324 2012-05-31 22:24:02Z andrea $ # Maintainer: Andrea Scarpino pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2') pkgver=4.8.80 -pkgrel=1 +pkgrel=2 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'qscintilla') source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('72bd95baeaf8ab71a66de6da8bba09e978e59bd2') +sha1sums=('bd93872670dc56b0007467a6a9319089e84eb431') build() { export PYTHONDONTWRITEBYTECODE="TRUE" diff --git a/kde-unstable/kdebindings-smokegen/PKGBUILD b/kde-unstable/kdebindings-smokegen/PKGBUILD index 6c47db7fc..9fb9c173d 100644 --- a/kde-unstable/kdebindings-smokegen/PKGBUILD +++ b/kde-unstable/kdebindings-smokegen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160084 2012-05-29 22:22:13Z andrea $ +# $Id: PKGBUILD 160320 2012-05-31 22:21:32Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-smokegen pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/unstable/${pkgver}/src/smokegen-${pkgver}.tar.xz") -sha1sums=('3f98d0a97db5604a924fdf2e654640b0f257486a') +sha1sums=('0ab79864476cfb9888ce55226f539fced5b08ee4') build() { cd "${srcdir}" diff --git a/kde-unstable/kdebindings-smokeqt/PKGBUILD b/kde-unstable/kdebindings-smokeqt/PKGBUILD index 08600b411..15253da0b 100644 --- a/kde-unstable/kdebindings-smokeqt/PKGBUILD +++ b/kde-unstable/kdebindings-smokeqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160085 2012-05-29 22:22:40Z andrea $ +# $Id: PKGBUILD 160321 2012-05-31 22:22:04Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-smokeqt pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="Language independent library for Qt bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.xz") -sha1sums=('8ecb3a8aa49a7095ae4c0b74949ba66cb4d63c2d') +sha1sums=('c24027167d9d05a3feb5ebae8700359d3d92b8de') build() { cd "${srcdir}" diff --git a/kde-unstable/kdepim-runtime/PKGBUILD b/kde-unstable/kdepim-runtime/PKGBUILD index 5734ab542..26ed2dbdd 100644 --- a/kde-unstable/kdepim-runtime/PKGBUILD +++ b/kde-unstable/kdepim-runtime/PKGBUILD @@ -1,21 +1,26 @@ -# $Id: PKGBUILD 160083 2012-05-29 22:21:42Z andrea $ +# $Id: PKGBUILD 160319 2012-05-31 22:20:54Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdepim-runtime pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kdepim-runtime' license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime' 'libkgoogle') +depends=('kdebase-runtime' 'libkgapi') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('1c9b97f2e562edeebda926b16f8b97a257b000d0') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" + 'libkgapi.patch') +sha1sums=('c6c09b9b0e8e9f4e15bb8791ab333b22f949130b' + '84a962fea1bc8ed647fb6640befa1dc5f632092f') build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/libkgapi.patch + cd "${srcdir}" mkdir build cd build diff --git a/kde-unstable/kdepim-runtime/libkgapi.patch b/kde-unstable/kdepim-runtime/libkgapi.patch new file mode 100644 index 000000000..35fc55dff --- /dev/null +++ b/kde-unstable/kdepim-runtime/libkgapi.patch @@ -0,0 +1,1742 @@ +From: Dan Vrátil +Date: Thu, 31 May 2012 20:17:18 +0000 +Subject: Adapt Google resources to LibKGoogle/LibKGAPI renaming +X-Git-Url: http://quickgit.kde.org/?p=kdepim-runtime.git&a=commitdiff&h=0f169f44a5c514a7fc297041fa46f7a727ecf71d +--- +Adapt Google resources to LibKGoogle/LibKGAPI renaming + +- use KGAPI namespace +- fix headers location +- require LibKGAPI 0.4.0 + +REVIEW: 105109 +--- + + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -93,11 +93,11 @@ endif(NOT KDEPIM_NO_NEPOMUK) + find_package(Strigi) + macro_log_feature(STRIGI_FOUND "Strigi" "Strigi desktop search engine" "http://strigi.sourceforge.net" FALSE "" "") + +-set(LibKGoogle_MIN_VERSION 0.3.2) +-find_package(LibKGoogle QUIET NO_MODULE) +-macro_log_feature(LibKGoogle_FOUND "LibKGoogle" "A library to access Google services" "http://projects.kde.org/libkgoogle" FALSE "${LibKGoogle_MIN_VERSION}" "LibKGoogle is required to build Akonadi resources to access Google Contacts, Calendars and Tasks" ) ++set(LibKGAPI_MIN_VERSION 0.4.0) ++find_package(LibKGAPI QUIET NO_MODULE) ++macro_log_feature(LibKGAPI_FOUND "LibKGAPI" "A library to access Google services" "http://projects.kde.org/libkgapi" FALSE "${LibKGAPI_MIN_VERSION}" "LibKGAPI is required to build Akonadi resources to access Google Contacts, Calendars and Tasks" ) + +-if(LibKGoogle_FOUND) ++if(LibKGAPI_FOUND) + find_package(QJSON) + macro_log_feature(QJSON_FOUND "QJSON" "Qt library for handling JSON data" "http://qjson.sourceforge.net/" TRUE) + endif() + +--- a/resources/CMakeLists.txt ++++ b/resources/CMakeLists.txt +@@ -54,7 +54,7 @@ macro_optional_add_subdirectory( microbl + macro_optional_add_subdirectory( openxchange ) + add_subdirectory( pop3 ) + +-if( LibKGoogle_FOUND ) ++if( LibKGAPI_FOUND ) + add_subdirectory( google ) + endif() + + +--- a/resources/google/CMakeLists.txt ++++ b/resources/google/CMakeLists.txt +@@ -1,4 +1,4 @@ +-include_directories(${LibKGoogle_INCLUDE_DIR}) ++include_directories(${LibKGAPI_INCLUDE_DIR}) + + macro_optional_add_subdirectory(calendar) + macro_optional_add_subdirectory(contacts) + +--- a/resources/google/calendar/CMakeLists.txt ++++ b/resources/google/calendar/CMakeLists.txt +@@ -43,7 +43,7 @@ target_link_libraries(akonadi_googlecale + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEWEBKIT_LIBS} + ${QJSON_LIBRARIES} +- ${LibKGoogle_LIBRARY} ++ ${LibKGAPI_LIBRARY} + ) + + install(TARGETS akonadi_googlecalendar_resource ${INSTALL_TARGETS_DEFAULT_ARGS}) + +--- a/resources/google/calendar/calendareditor.cpp ++++ b/resources/google/calendar/calendareditor.cpp +@@ -23,8 +23,9 @@ + + #include + +-#include +-using namespace KGoogle::Objects; ++#include ++ ++using namespace KGAPI::Objects; + + CalendarEditor::CalendarEditor( Calendar *calendar ) : + QDialog(), +@@ -56,7 +57,7 @@ CalendarEditor::~CalendarEditor() + void CalendarEditor::accepted() + { + if ( !m_calendar ) { +- m_calendar = new KGoogle::Objects::Calendar(); ++ m_calendar = new KGAPI::Objects::Calendar(); + } + + m_calendar->setTitle( m_ui->nameEdit->text() ); + +--- a/resources/google/calendar/calendareditor.h ++++ b/resources/google/calendar/calendareditor.h +@@ -20,13 +20,13 @@ + + #include + +-#include ++#include + + namespace Ui { + class CalendarEditor; + } + +-using namespace KGoogle::Objects; ++using namespace KGAPI::Objects; + + class CalendarEditor: public QDialog + { +@@ -37,7 +37,7 @@ class CalendarEditor: public QDialog + virtual ~CalendarEditor(); + + Q_SIGNALS: +- void accepted( KGoogle::Objects::Calendar *calendar ); ++ void accepted( KGAPI::Objects::Calendar *calendar ); + + private Q_SLOTS: + void accepted(); + +--- a/resources/google/calendar/calendarresource.cpp ++++ b/resources/google/calendar/calendarresource.cpp +@@ -36,23 +36,23 @@ + #include + #include + +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + + using namespace KCalCore; + using namespace Akonadi; +-using namespace KGoogle; ++using namespace KGAPI; + + CalendarResource::CalendarResource( const QString &id ): + ResourceBase( id ), +@@ -60,8 +60,8 @@ CalendarResource::CalendarResource( cons + m_fetchedCalendars( false ), + m_fetchedTaskLists( false ) + { +- qRegisterMetaType< KGoogle::Services::Calendar >( "Calendar" ); +- qRegisterMetaType< KGoogle::Services::Tasks >( "Tasks" ); ++ qRegisterMetaType< KGAPI::Services::Calendar >( "Calendar" ); ++ qRegisterMetaType< KGAPI::Services::Tasks >( "Tasks" ); + AttributeFactory::registerAttribute< DefaultReminderAttribute >(); + + Auth *auth = Auth::instance(); +@@ -71,10 +71,10 @@ CalendarResource::CalendarResource( cons + setOnline( true ); + + m_gam = new AccessManager(); +- connect( m_gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); +- connect( m_gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(replyReceived(KGoogle::Reply*)) ); ++ connect( m_gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); ++ connect( m_gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(replyReceived(KGAPI::Reply*)) ); + + connect( this, SIGNAL(abortRequested()), + this, SLOT(slotAbortRequested()) ); +@@ -113,7 +113,7 @@ void CalendarResource::slotAbortRequeste + abort(); + } + +-void CalendarResource::error( const KGoogle::Error errCode, const QString &msg ) ++void CalendarResource::error( const KGAPI::Error errCode, const QString &msg ) + { + cancelTask( msg ); + +@@ -160,7 +160,7 @@ Account::Ptr CalendarResource::getAccoun + Auth *auth = Auth::instance(); + try { + m_account = auth->getAccount( Settings::self()->account() ); +- } catch( KGoogle::Exception::BaseException &e ) { ++ } catch( KGAPI::Exception::BaseException &e ) { + Q_EMIT status( Broken, e.what() ); + return Account::Ptr(); + } +@@ -267,7 +267,7 @@ bool CalendarResource::retrieveItem( con + return true; + } + +- Request *request = new Request( url, KGoogle::Request::Fetch, service, account ); ++ Request *request = new Request( url, KGAPI::Request::Fetch, service, account ); + request->setProperty( "Item", QVariant::fromValue( item ) ); + m_gam->sendRequest( request ); + +@@ -340,7 +340,7 @@ void CalendarResource::itemAdded( const + + Services::Calendar service; + kevent.setUid( "" ); +- data = service.objectToJSON( static_cast< KGoogle::Object * >( &kevent ) ); ++ data = service.objectToJSON( static_cast< KGAPI::Object * >( &kevent ) ); + + } else if ( item.mimeType() == Todo::todoMimeType() ) { + +@@ -355,7 +355,7 @@ void CalendarResource::itemAdded( const + } + + Services::Tasks service; +- data = service.objectToJSON( static_cast< KGoogle::Object * >( &ktodo ) ); ++ data = service.objectToJSON( static_cast< KGAPI::Object * >( &ktodo ) ); + + } else { + cancelTask( i18n( "Unknown payload type '%1'", item.mimeType() ) ); +@@ -399,7 +399,7 @@ void CalendarResource::itemChanged( cons + url = Services::Calendar::updateEventUrl( item.parentCollection().remoteId(), item.remoteId() ); + + Services::Calendar service; +- data = service.objectToJSON( static_cast< KGoogle::Object * >( &kevent ) ); ++ data = service.objectToJSON( static_cast< KGAPI::Object * >( &kevent ) ); + + Request *request = new Request( url, Request::Patch, "Calendar", account ); + request->setRequestData( data, "application/json" ); +@@ -498,13 +498,13 @@ void CalendarResource::itemMoved( const + url = Services::Calendar::moveEventUrl( collectionSource.remoteId(), + collectionDestination.remoteId(), + item.remoteId() ); +- Request *request = new Request( url, KGoogle::Request::Move, "Calendar", account ); ++ Request *request = new Request( url, KGAPI::Request::Move, "Calendar", account ); + request->setProperty( "Item", qVariantFromValue( item ) ); + + m_gam->sendRequest( request ); + } + +-void CalendarResource::replyReceived( KGoogle::Reply *reply ) ++void CalendarResource::replyReceived( KGAPI::Reply *reply ) + { + switch ( reply->requestType() ) { + case Request::FetchAll: + +--- a/resources/google/calendar/calendarresource.h ++++ b/resources/google/calendar/calendarresource.h +@@ -23,17 +23,17 @@ + #include + #include + +-#include +-#include ++#include ++#include + +-namespace KGoogle { ++namespace KGAPI { + class AccessManager; + class Account; + class Reply; + class Request; + } + +-using namespace KGoogle; ++using namespace KGAPI; + + class CalendarResource : public Akonadi::ResourceBase, public Akonadi::AgentBase::ObserverV2 + { +@@ -61,40 +61,40 @@ class CalendarResource : public Akonadi: + void aboutToQuit(); + + private Q_SLOTS: +- void error( const KGoogle::Error, const QString & ); ++ void error( const KGAPI::Error, const QString & ); + void slotAbortRequested(); + + void cachedItemsRetrieved( KJob *job ); +- void replyReceived( KGoogle::Reply *reply ); ++ void replyReceived( KGAPI::Reply *reply ); + + void itemsReceived( KJob *job ); +- void itemReceived( KGoogle::Reply *reply ); +- void itemCreated( KGoogle::Reply *reply ); +- void itemUpdated( KGoogle::Reply *reply ); +- void itemRemoved( KGoogle::Reply *reply ); +- void itemMoved( KGoogle::Reply *reply ); ++ void itemReceived( KGAPI::Reply *reply ); ++ void itemCreated( KGAPI::Reply *reply ); ++ void itemUpdated( KGAPI::Reply *reply ); ++ void itemRemoved( KGAPI::Reply *reply ); ++ void itemMoved( KGAPI::Reply *reply ); + + void taskListReceived( KJob *job ); + void calendarsReceived( KJob *job ); + + /* The actual update of task */ +- void taskDoUpdate( KGoogle::Reply *reply ); ++ void taskDoUpdate( KGAPI::Reply *reply ); + +- void taskReceived( KGoogle::Reply *reply ); ++ void taskReceived( KGAPI::Reply *reply ); + void tasksReceived( KJob *job ); +- void taskCreated( KGoogle::Reply *reply ); +- void taskUpdated( KGoogle::Reply *reply ); +- void taskRemoved( KGoogle::Reply *reply ); ++ void taskCreated( KGAPI::Reply *reply ); ++ void taskUpdated( KGAPI::Reply *reply ); ++ void taskRemoved( KGAPI::Reply *reply ); + + void removeTaskFetchJobFinished( KJob *job ); + void doRemoveTask( KJob *job ); + +- void eventReceived( KGoogle::Reply *reply ); ++ void eventReceived( KGAPI::Reply *reply ); + void eventsReceived( KJob *job ); +- void eventCreated( KGoogle::Reply *reply ); +- void eventUpdated( KGoogle::Reply *reply ); +- void eventRemoved( KGoogle::Reply *reply ); +- void eventMoved( KGoogle::Reply *reply ); ++ void eventCreated( KGAPI::Reply *reply ); ++ void eventUpdated( KGAPI::Reply *reply ); ++ void eventRemoved( KGAPI::Reply *reply ); ++ void eventMoved( KGAPI::Reply *reply ); + + void emitPercent( KJob *job, ulong percent ); + + +--- a/resources/google/calendar/defaultreminderattribute.cpp ++++ b/resources/google/calendar/defaultreminderattribute.cpp +@@ -19,13 +19,13 @@ + + #include + +-#include ++#include + + #include + #include + + using namespace KCalCore; +-using namespace KGoogle::Objects; ++using namespace KGAPI::Objects; + + DefaultReminderAttribute::DefaultReminderAttribute( const Reminder::List &reminders ) + : m_reminders( reminders ) + +--- a/resources/google/calendar/defaultreminderattribute.h ++++ b/resources/google/calendar/defaultreminderattribute.h +@@ -19,14 +19,14 @@ + #ifndef GOOGLE_CALENDAR_DEFAULTREMINDERATTRIBUTE_H + #define GOOGLE_CALENDAR_DEFAULTREMINDERATTRIBUTE_H + +-#include ++#include + + #include + #include + #include + + using namespace KCalCore; +-using namespace KGoogle; ++using namespace KGAPI; + + class DefaultReminderAttribute : public Akonadi::Attribute + { + +--- a/resources/google/calendar/resource_events.cpp ++++ b/resources/google/calendar/resource_events.cpp +@@ -19,12 +19,12 @@ + #include "defaultreminderattribute.h" + #include "settings.h" + +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include + + #include + +@@ -37,7 +37,7 @@ + #include + + using namespace Akonadi; +-using namespace KGoogle; ++using namespace KGAPI; + + void CalendarResource::calendarsReceived( KJob *job ) + { +@@ -51,8 +51,8 @@ void CalendarResource::calendarsReceived + + QStringList calendars = Settings::self()->calendars(); + +- QList< KGoogle::Object *> allData = fetchJob->items(); +- Q_FOREACH ( KGoogle::Object * replyData, allData ) { ++ QList< KGAPI::Object *> allData = fetchJob->items(); ++ Q_FOREACH ( KGAPI::Object * replyData, allData ) { + + Objects::Calendar *calendar = static_cast< Objects::Calendar * >( replyData ); + +@@ -94,7 +94,7 @@ void CalendarResource::calendarsReceived + } + } + +-void CalendarResource::eventReceived( KGoogle::Reply *reply ) ++void CalendarResource::eventReceived( KGAPI::Reply *reply ) + { + if ( reply->error() != OK ) { + cancelTask(); +@@ -218,7 +218,7 @@ void CalendarResource::eventsReceived( K + modifyJob->start(); + } + +-void CalendarResource::eventCreated( KGoogle::Reply *reply ) ++void CalendarResource::eventCreated( KGAPI::Reply *reply ) + { + if ( reply->error() != OK ) { + cancelTask( i18n( "Failed to create a new event: %1", reply->errorString() ) ); +@@ -244,7 +244,7 @@ void CalendarResource::eventCreated( KGo + changeCommitted( item ); + } + +-void CalendarResource::eventUpdated( KGoogle::Reply *reply ) ++void CalendarResource::eventUpdated( KGAPI::Reply *reply ) + { + if ( reply->error() != OK ) { + cancelTask( i18n( "Failed to update an event: %1", reply->errorString() ) ); +@@ -266,7 +266,7 @@ void CalendarResource::eventUpdated( KGo + changeCommitted( item ); + } + +-void CalendarResource::eventRemoved( KGoogle::Reply *reply ) ++void CalendarResource::eventRemoved( KGAPI::Reply *reply ) + { + if ( reply->error() != NoContent ) { + cancelTask( i18n( "Failed to delete event: %1", reply->errorString() ) ); +@@ -277,7 +277,7 @@ void CalendarResource::eventRemoved( KGo + changeCommitted( item ); + } + +-void CalendarResource::eventMoved( KGoogle::Reply *reply ) ++void CalendarResource::eventMoved( KGAPI::Reply *reply ) + { + if ( reply->error() != OK ) { + cancelTask( i18n( "Failed to move event: %1", reply->errorString() ) ); + +--- a/resources/google/calendar/resource_tasks.cpp ++++ b/resources/google/calendar/resource_tasks.cpp +@@ -18,13 +18,13 @@ + #include "calendarresource.h" + #include "settings.h" + +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + + #include + #include +@@ -36,7 +36,7 @@ + #include + + using namespace Akonadi; +-using namespace KGoogle; ++using namespace KGAPI; + using namespace KCalCore; + + void CalendarResource::taskDoUpdate( Reply *reply ) +@@ -54,7 +54,7 @@ void CalendarResource::taskDoUpdate( Rep + QUrl url = Services::Tasks::updateTaskUrl( item.parentCollection().remoteId(), item.remoteId() ); + + Services::Tasks service; +- QByteArray data = service.objectToJSON( static_cast< KGoogle::Object *>( &ktodo ) ); ++ QByteArray data = service.objectToJSON( static_cast< KGAPI::Object *>( &ktodo ) ); + + Request *request = new Request( url, Request::Update, "Tasks", account ); + request->setRequestData( data, "application/json" ); +@@ -110,7 +110,7 @@ void CalendarResource::taskListReceived( + } + } + +-void CalendarResource::taskReceived( KGoogle::Reply *reply ) ++void CalendarResource::taskReceived( KGAPI::Reply *reply ) + { + if ( reply->error() != OK ) { + cancelTask( i18n( "Failed to fetch task: %1", reply->errorString() ) ); +@@ -180,7 +180,7 @@ void CalendarResource::tasksReceived( KJ + modifyJob->start(); + } + +-void CalendarResource::taskCreated( KGoogle::Reply *reply ) ++void CalendarResource::taskCreated( KGAPI::Reply *reply ) + { + if ( reply->error() != OK ) { + cancelTask( i18n( "Failed to create a task: %1", reply->errorString() ) ); +@@ -205,7 +205,7 @@ void CalendarResource::taskCreated( KGoo + changeCommitted( item ); + } + +-void CalendarResource::taskUpdated( KGoogle::Reply *reply ) ++void CalendarResource::taskUpdated( KGAPI::Reply *reply ) + { + if ( reply->error() != OK ) { + cancelTask( i18n( "Failed to update task: %1", reply->errorString() ) ); +@@ -290,12 +290,12 @@ void CalendarResource::doRemoveTask( KJo + Request *request = + new Request( + Services::Tasks::removeTaskUrl( item.parentCollection().remoteId(), item.remoteId() ), +- KGoogle::Request::Remove, "Tasks", account ); ++ KGAPI::Request::Remove, "Tasks", account ); + request->setProperty( "Item", qVariantFromValue( item ) ); + m_gam->sendRequest( request ); + } + +-void CalendarResource::taskRemoved( KGoogle::Reply *reply ) ++void CalendarResource::taskRemoved( KGAPI::Reply *reply ) + { + if ( reply->error() != NoContent ) { + cancelTask( i18n( "Failed to delete task (5): %1", reply->errorString() ) ); + +--- a/resources/google/calendar/settingsdialog.cpp ++++ b/resources/google/calendar/settingsdialog.cpp +@@ -30,20 +30,20 @@ + #include + #include + +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + +-using namespace KGoogle; ++using namespace KGAPI; + + enum { +- KGoogleObjectRole = Qt::UserRole, ++ KGAPIObjectRole = Qt::UserRole, + ObjectUIDRole = Qt::UserRole + 1 + }; + +@@ -51,8 +51,8 @@ SettingsDialog::SettingsDialog( WId wind + KDialog( parent ), + m_windowId( windowId ) + { +- qRegisterMetaType( "Calendar" ); +- qRegisterMetaType( "Tasks" ); ++ qRegisterMetaType( "Calendar" ); ++ qRegisterMetaType( "Tasks" ); + + KWindowSystem::setMainWindow( this, windowId ); + +@@ -98,14 +98,14 @@ SettingsDialog::SettingsDialog( WId wind + connect( this, SIGNAL(accepted()), + this, SLOT(saveSettings()) ); + +- m_gam = new KGoogle::AccessManager; +- connect( m_gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(gam_objectsListReceived(KGoogle::Reply*)) ); +- connect( m_gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ m_gam = new KGAPI::AccessManager; ++ connect( m_gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(gam_objectsListReceived(KGAPI::Reply*)) ); ++ connect( m_gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- KGoogle::Auth *auth = KGoogle::Auth::instance(); +- connect( auth, SIGNAL(authenticated(KGoogle::Account::Ptr&)), ++ KGAPI::Auth *auth = KGAPI::Auth::instance(); ++ connect( auth, SIGNAL(authenticated(KGAPI::Account::Ptr&)), + this, SLOT(reloadAccounts()) ); + + m_ui->accountsCombo->clear(); +@@ -121,7 +121,7 @@ SettingsDialog::~SettingsDialog() + delete m_ui; + } + +-void SettingsDialog::error( KGoogle::Error code, const QString &msg ) ++void SettingsDialog::error( KGAPI::Error code, const QString &msg ) + { + KMessageBox::sorry( this, msg, i18n( "Error while talking to Google" ) ); + +@@ -183,22 +183,22 @@ void SettingsDialog::reloadAccounts() + + void SettingsDialog::addAccountClicked() + { +- KGoogle::Auth *auth = KGoogle::Auth::instance(); ++ KGAPI::Auth *auth = KGAPI::Auth::instance(); + +- KGoogle::Account::Ptr account( new KGoogle::Account() ); ++ KGAPI::Account::Ptr account( new KGAPI::Account() ); + account->addScope( Services::Calendar::ScopeUrl ); + account->addScope( Services::Tasks::ScopeUrl ); + + try { + auth->authenticate( account, true ); +- } catch ( KGoogle::Exception::BaseException &e ) { ++ } catch ( KGAPI::Exception::BaseException &e ) { + KMessageBox::error( this, e.what() ); + } + } + + void SettingsDialog::removeAccountClicked() + { +- KGoogle::Account::Ptr account = m_ui->accountsCombo->currentAccount(); ++ KGAPI::Account::Ptr account = m_ui->accountsCombo->currentAccount(); + if ( account.isNull() ) { + return; + } +@@ -217,10 +217,10 @@ void SettingsDialog::removeAccountClicke + return; + } + +- KGoogle::Auth *auth = KGoogle::Auth::instance(); ++ KGAPI::Auth *auth = KGAPI::Auth::instance(); + try { + auth->revoke( account ); +- } catch ( KGoogle::Exception::BaseException &e ) { ++ } catch ( KGAPI::Exception::BaseException &e ) { + KMessageBox::error( this, e.what() ); + } + +@@ -243,15 +243,15 @@ void SettingsDialog::accountChanged() + return; + } + +- KGoogle::Request *request; ++ KGAPI::Request *request; + + m_ui->calendarsList->clear(); +- request = new KGoogle::Request( Services::Calendar::fetchCalendarsUrl(), ++ request = new KGAPI::Request( Services::Calendar::fetchCalendarsUrl(), + Request::FetchAll, "Calendar", account ); + m_gam->queueRequest( request ); + + m_ui->tasksList->clear(); +- request = new KGoogle::Request( Services::Tasks::fetchTaskListsUrl(), ++ request = new KGAPI::Request( Services::Tasks::fetchTaskListsUrl(), + Request::FetchAll, "Tasks", account ); + m_gam->sendRequest( request ); + } +@@ -259,19 +259,19 @@ void SettingsDialog::accountChanged() + void SettingsDialog::addCalendarClicked() + { + QPointer editor = new CalendarEditor; +- connect( editor, SIGNAL(accepted(KGoogle::Objects::Calendar*)), +- this, SLOT(addCalendar(KGoogle::Objects::Calendar*)) ); ++ connect( editor, SIGNAL(accepted(KGAPI::Objects::Calendar*)), ++ this, SLOT(addCalendar(KGAPI::Objects::Calendar*)) ); + + editor->exec(); + + delete editor; + } + +-void SettingsDialog::addCalendar( KGoogle::Objects::Calendar *calendar ) ++void SettingsDialog::addCalendar( KGAPI::Objects::Calendar *calendar ) + { +- KGoogle::Account::Ptr account; +- KGoogle::AccessManager *gam; +- KGoogle::Request *request; ++ KGAPI::Account::Ptr account; ++ KGAPI::AccessManager *gam; ++ KGAPI::Request *request; + Services::Calendar parser; + QByteArray data; + +@@ -283,17 +283,17 @@ void SettingsDialog::addCalendar( KGoogl + m_ui->accountsBox->setDisabled( true ); + m_ui->calendarsBox->setDisabled( true ); + +- gam = new KGoogle::AccessManager; +- connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(gam_objectCreated(KGoogle::Reply*)) ); +- connect( gam, SIGNAL(requestFinished(KGoogle::Request*)), ++ gam = new KGAPI::AccessManager; ++ connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(gam_objectCreated(KGAPI::Reply*)) ); ++ connect( gam, SIGNAL(requestFinished(KGAPI::Request*)), + gam, SLOT(deleteLater()) ); +- connect( gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect( gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- request = new KGoogle::Request( Services::Calendar::createCalendarUrl(), ++ request = new KGAPI::Request( Services::Calendar::createCalendarUrl(), + Request::Create, "Calendar", account ); +- data = parser.objectToJSON( dynamic_cast< KGoogle::Object * >( calendar ) ); ++ data = parser.objectToJSON( dynamic_cast< KGAPI::Object * >( calendar ) ); + request->setRequestData( data, "application/json" ); + gam->sendRequest( request ); + +@@ -316,25 +316,25 @@ void SettingsDialog::editCalendarClicked + return; + } + +- calendar = item->data( KGoogleObjectRole ).value< KGoogle::Objects::Calendar * >(); ++ calendar = item->data( KGAPIObjectRole ).value< KGAPI::Objects::Calendar * >(); + if ( !calendar ) { + return; + } + + QPointer editor = new CalendarEditor( calendar ); +- connect( editor, SIGNAL(accepted(KGoogle::Objects::Calendar*)), +- this, SLOT(editCalendar(KGoogle::Objects::Calendar*)) ); ++ connect( editor, SIGNAL(accepted(KGAPI::Objects::Calendar*)), ++ this, SLOT(editCalendar(KGAPI::Objects::Calendar*)) ); + + editor->exec(); + + delete editor; + } + +-void SettingsDialog::editCalendar( KGoogle::Objects::Calendar *calendar ) ++void SettingsDialog::editCalendar( KGAPI::Objects::Calendar *calendar ) + { +- KGoogle::Account::Ptr account; +- KGoogle::AccessManager *gam; +- KGoogle::Request *request; ++ KGAPI::Account::Ptr account; ++ KGAPI::AccessManager *gam; ++ KGAPI::Request *request; + Services::Calendar parser; + QByteArray data; + +@@ -346,17 +346,17 @@ void SettingsDialog::editCalendar( KGoog + m_ui->accountsBox->setDisabled( true ); + m_ui->calendarsBox->setDisabled( true ); + +- gam = new KGoogle::AccessManager; +- connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(gam_objectModified(KGoogle::Reply*)) ); +- connect( gam, SIGNAL(requestFinished(KGoogle::Request*)), ++ gam = new KGAPI::AccessManager; ++ connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(gam_objectModified(KGAPI::Reply*)) ); ++ connect( gam, SIGNAL(requestFinished(KGAPI::Request*)), + gam, SLOT(deleteLater()) ); +- connect( gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect( gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- request = new KGoogle::Request( Services::Calendar::updateCalendarUrl( calendar->uid() ), ++ request = new KGAPI::Request( Services::Calendar::updateCalendarUrl( calendar->uid() ), + Request::Update, "Calendar", account ); +- data = parser.objectToJSON( dynamic_cast< KGoogle::Object * >( calendar ) ); ++ data = parser.objectToJSON( dynamic_cast< KGAPI::Object * >( calendar ) ); + request->setRequestData( data, "application/json" ); + gam->sendRequest( request ); + +@@ -379,7 +379,7 @@ void SettingsDialog::removeCalendarClick + return; + } + +- calendar = item->data( KGoogleObjectRole ).value< KGoogle::Objects::Calendar * >(); ++ calendar = item->data( KGAPIObjectRole ).value< KGAPI::Objects::Calendar * >(); + if ( !calendar ) { + return; + } +@@ -398,9 +398,9 @@ void SettingsDialog::removeCalendarClick + return; + } + +- KGoogle::Account::Ptr account; +- KGoogle::AccessManager *gam; +- KGoogle::Request *request; ++ KGAPI::Account::Ptr account; ++ KGAPI::AccessManager *gam; ++ KGAPI::Request *request; + + account = m_ui->accountsCombo->currentAccount(); + if ( account.isNull() ) { +@@ -410,15 +410,15 @@ void SettingsDialog::removeCalendarClick + m_ui->accountsBox->setDisabled( true ); + m_ui->calendarsBox->setDisabled( true ); + +- gam = new KGoogle::AccessManager; +- connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)), ++ gam = new KGAPI::AccessManager; ++ connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)), + this, SLOT(reloadCalendarsClicked()) ); +- connect( gam, SIGNAL(requestFinished(KGoogle::Request*)), ++ connect( gam, SIGNAL(requestFinished(KGAPI::Request*)), + gam, SLOT(deleteLater()) ); +- connect( gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect( gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- request = new KGoogle::Request( Services::Calendar::removeCalendarUrl( calendar->uid() ), ++ request = new KGAPI::Request( Services::Calendar::removeCalendarUrl( calendar->uid() ), + Request::Remove, "Calendar", account ); + gam->sendRequest( request ); + } +@@ -426,8 +426,8 @@ void SettingsDialog::removeCalendarClick + void SettingsDialog::addTaskListClicked() + { + TasklistEditor *editor = new TasklistEditor; +- connect( editor, SIGNAL(accepted(KGoogle::Objects::TaskList*)), +- this, SLOT(addTaskList(KGoogle::Objects::TaskList*)) ); ++ connect( editor, SIGNAL(accepted(KGAPI::Objects::TaskList*)), ++ this, SLOT(addTaskList(KGAPI::Objects::TaskList*)) ); + + editor->exec(); + +@@ -436,9 +436,9 @@ void SettingsDialog::addTaskListClicked( + + void SettingsDialog::reloadCalendarsClicked() + { +- KGoogle::AccessManager *gam; +- KGoogle::Account::Ptr account; +- KGoogle::Request *request; ++ KGAPI::AccessManager *gam; ++ KGAPI::Account::Ptr account; ++ KGAPI::Request *request; + + account = m_ui->accountsCombo->currentAccount(); + if ( account.isNull() ) { +@@ -449,24 +449,24 @@ void SettingsDialog::reloadCalendarsClic + m_ui->calendarsBox->setDisabled( true ); + + m_ui->calendarsList->clear(); +- gam = new KGoogle::AccessManager; +- connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(gam_objectsListReceived(KGoogle::Reply*)) ); +- connect( gam, SIGNAL(requestFinished(KGoogle::Request*)), ++ gam = new KGAPI::AccessManager; ++ connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(gam_objectsListReceived(KGAPI::Reply*)) ); ++ connect( gam, SIGNAL(requestFinished(KGAPI::Request*)), + gam, SLOT(deleteLater()) ); +- connect( gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect( gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- request = new KGoogle::Request( Services::Calendar::fetchCalendarsUrl(), ++ request = new KGAPI::Request( Services::Calendar::fetchCalendarsUrl(), + Request::FetchAll, "Calendar", account ); + gam->sendRequest( request ); + } + + void SettingsDialog::addTaskList( TaskList *taskList ) + { +- KGoogle::Account::Ptr account; +- KGoogle::AccessManager *gam; +- KGoogle::Request *request; ++ KGAPI::Account::Ptr account; ++ KGAPI::AccessManager *gam; ++ KGAPI::Request *request; + Services::Tasks parser; + QByteArray data; + +@@ -478,17 +478,17 @@ void SettingsDialog::addTaskList( TaskLi + m_ui->accountsBox->setDisabled( true ); + m_ui->tasksBox->setDisabled( true ); + +- gam = new KGoogle::AccessManager; +- connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(gam_objectCreated(KGoogle::Reply*)) ); +- connect( gam, SIGNAL(requestFinished(KGoogle::Request*)), ++ gam = new KGAPI::AccessManager; ++ connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(gam_objectCreated(KGAPI::Reply*)) ); ++ connect( gam, SIGNAL(requestFinished(KGAPI::Request*)), + gam, SLOT(deleteLater()) ); +- connect( gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect( gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- request = new KGoogle::Request( Services::Tasks::createTaskListUrl(), ++ request = new KGAPI::Request( Services::Tasks::createTaskListUrl(), + Request::Create, "Tasks", account ); +- data = parser.objectToJSON( dynamic_cast< KGoogle::Object * >( taskList ) ); ++ data = parser.objectToJSON( dynamic_cast< KGAPI::Object * >( taskList ) ); + request->setRequestData( data, "application/json" ); + gam->sendRequest( request ); + +@@ -511,14 +511,14 @@ void SettingsDialog::editTaskListClicked + return; + } + +- taskList = item->data( KGoogleObjectRole ).value< KGoogle::Objects::TaskList * >(); ++ taskList = item->data( KGAPIObjectRole ).value< KGAPI::Objects::TaskList * >(); + if ( !taskList ) { + return; + } + + QPointer editor = new TasklistEditor( taskList ); +- connect( editor, SIGNAL(accepted(KGoogle::Objects::TaskList*)), +- this, SLOT(editTaskList(KGoogle::Objects::TaskList*)) ); ++ connect( editor, SIGNAL(accepted(KGAPI::Objects::TaskList*)), ++ this, SLOT(editTaskList(KGAPI::Objects::TaskList*)) ); + + editor->exec(); + +@@ -527,9 +527,9 @@ void SettingsDialog::editTaskListClicked + + void SettingsDialog::editTaskList( TaskList *taskList ) + { +- KGoogle::Account::Ptr account; +- KGoogle::AccessManager *gam; +- KGoogle::Request *request; ++ KGAPI::Account::Ptr account; ++ KGAPI::AccessManager *gam; ++ KGAPI::Request *request; + Services::Tasks parser; + QByteArray data; + +@@ -541,17 +541,17 @@ void SettingsDialog::editTaskList( TaskL + m_ui->accountsBox->setDisabled( true ); + m_ui->tasksBox->setDisabled( true ); + +- gam = new KGoogle::AccessManager; +- connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(gam_objectModified(KGoogle::Reply*)) ); +- connect( gam, SIGNAL(requestFinished(KGoogle::Request*)), ++ gam = new KGAPI::AccessManager; ++ connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(gam_objectModified(KGAPI::Reply*)) ); ++ connect( gam, SIGNAL(requestFinished(KGAPI::Request*)), + gam, SLOT(deleteLater()) ); +- connect( gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect( gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- request = new KGoogle::Request( Services::Tasks::updateTaskListUrl( taskList->uid() ), ++ request = new KGAPI::Request( Services::Tasks::updateTaskListUrl( taskList->uid() ), + Request::Update, "Tasks", account ); +- data = parser.objectToJSON( dynamic_cast< KGoogle::Object * >( taskList ) ); ++ data = parser.objectToJSON( dynamic_cast< KGAPI::Object * >( taskList ) ); + request->setRequestData( data, "application/json" ); + gam->sendRequest( request ); + +@@ -574,7 +574,7 @@ void SettingsDialog::removeTaskListClick + return; + } + +- taskList = item->data( KGoogleObjectRole ).value< KGoogle::Objects::TaskList * >(); ++ taskList = item->data( KGAPIObjectRole ).value< KGAPI::Objects::TaskList * >(); + if ( !taskList ) { + return; + } +@@ -593,9 +593,9 @@ void SettingsDialog::removeTaskListClick + return; + } + +- KGoogle::Account::Ptr account; +- KGoogle::AccessManager *gam; +- KGoogle::Request *request; ++ KGAPI::Account::Ptr account; ++ KGAPI::AccessManager *gam; ++ KGAPI::Request *request; + + account = m_ui->accountsCombo->currentAccount(); + if ( account.isNull() ) { +@@ -605,24 +605,24 @@ void SettingsDialog::removeTaskListClick + m_ui->accountsBox->setDisabled( true ); + m_ui->tasksBox->setDisabled( true ); + +- gam = new KGoogle::AccessManager; +- connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)), ++ gam = new KGAPI::AccessManager; ++ connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)), + this, SLOT(reloadTaskListsClicked()) ); +- connect( gam, SIGNAL(requestFinished(KGoogle::Request*)), ++ connect( gam, SIGNAL(requestFinished(KGAPI::Request*)), + gam, SLOT(deleteLater()) ); +- connect( gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect( gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- request = new KGoogle::Request( Services::Tasks::removeTaskListUrl( taskList->uid() ), ++ request = new KGAPI::Request( Services::Tasks::removeTaskListUrl( taskList->uid() ), + Request::Remove, "Tasks", account ); + gam->sendRequest( request ); + } + + void SettingsDialog::reloadTaskListsClicked() + { +- KGoogle::AccessManager *gam; +- KGoogle::Account::Ptr account; +- KGoogle::Request *request; ++ KGAPI::AccessManager *gam; ++ KGAPI::Account::Ptr account; ++ KGAPI::Request *request; + + account = m_ui->accountsCombo->currentAccount(); + if ( !account ) { +@@ -634,30 +634,30 @@ void SettingsDialog::reloadTaskListsClic + + m_ui->tasksList->clear(); + +- gam = new KGoogle::AccessManager; +- connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(gam_objectsListReceived(KGoogle::Reply*)) ); +- connect( gam, SIGNAL(requestFinished(KGoogle::Request*)), ++ gam = new KGAPI::AccessManager; ++ connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(gam_objectsListReceived(KGAPI::Reply*)) ); ++ connect( gam, SIGNAL(requestFinished(KGAPI::Request*)), + gam, SLOT(deleteLater()) ); +- connect (gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect (gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- request = new KGoogle::Request( Services::Tasks::fetchTaskListsUrl(), ++ request = new KGAPI::Request( Services::Tasks::fetchTaskListsUrl(), + Request::FetchAll, "Tasks", account ); + gam->sendRequest( request ); + } + + void SettingsDialog::gam_objectCreated( Reply *reply ) + { +- QList< KGoogle::Object * > objects = reply->replyData(); ++ QList< KGAPI::Object * > objects = reply->replyData(); + + if ( reply->serviceName() == "Calendar" ) { + +- Q_FOREACH ( KGoogle::Object * object, objects ) { +- KGoogle::Objects::Calendar *calendar = static_cast< KGoogle::Objects::Calendar * >( object ); ++ Q_FOREACH ( KGAPI::Object * object, objects ) { ++ KGAPI::Objects::Calendar *calendar = static_cast< KGAPI::Objects::Calendar * >( object ); + + QListWidgetItem *item = new QListWidgetItem( calendar->title() ); +- item->setData( KGoogleObjectRole, qVariantFromValue( calendar ) ); ++ item->setData( KGAPIObjectRole, qVariantFromValue( calendar ) ); + item->setData( ObjectUIDRole, calendar->uid() ); + item->setCheckState( Qt::Unchecked ); + +@@ -669,11 +669,11 @@ void SettingsDialog::gam_objectCreated( + + } else if ( reply->serviceName() == "Tasks" ) { + +- Q_FOREACH ( KGoogle::Object * object, objects ) { +- KGoogle::Objects::TaskList *taskList = static_cast< KGoogle::Objects::TaskList * >( object ); ++ Q_FOREACH ( KGAPI::Object * object, objects ) { ++ KGAPI::Objects::TaskList *taskList = static_cast< KGAPI::Objects::TaskList * >( object ); + + QListWidgetItem *item = new QListWidgetItem( taskList->title() ); +- item->setData( KGoogleObjectRole, qVariantFromValue( taskList ) ); ++ item->setData( KGAPIObjectRole, qVariantFromValue( taskList ) ); + item->setData( ObjectUIDRole, taskList->uid() ); + item->setCheckState( Qt::Unchecked ); + +@@ -690,18 +690,18 @@ void SettingsDialog::gam_objectCreated( + + void SettingsDialog::gam_objectsListReceived( Reply *reply ) + { +- QList< KGoogle::Object * > objects = reply->replyData(); ++ QList< KGAPI::Object * > objects = reply->replyData(); + + if ( reply->serviceName() == "Calendar" ) { + +- Q_FOREACH ( KGoogle::Object * object, objects ) { ++ Q_FOREACH ( KGAPI::Object * object, objects ) { + Objects::Calendar *calendar; + QListWidgetItem *item; + + calendar = static_cast< Objects::Calendar * >( object ); + item = new QListWidgetItem; + item->setText( calendar->title() ); +- item->setData( KGoogleObjectRole, qVariantFromValue( calendar ) ); ++ item->setData( KGAPIObjectRole, qVariantFromValue( calendar ) ); + item->setData( ObjectUIDRole, calendar->uid() ); + + if ( Settings::self()->calendars().contains( calendar->uid() ) ) { +@@ -718,14 +718,14 @@ void SettingsDialog::gam_objectsListRece + + } else if ( reply->serviceName() == "Tasks" ) { + +- Q_FOREACH ( KGoogle::Object *object, objects ) { ++ Q_FOREACH ( KGAPI::Object *object, objects ) { + Objects::TaskList *taskList; + QListWidgetItem *item; + + taskList = static_cast< Objects::TaskList * >( object ); + item = new QListWidgetItem; + item->setText( taskList->title() ); +- item->setData( KGoogleObjectRole, qVariantFromValue( taskList ) ); ++ item->setData( KGAPIObjectRole, qVariantFromValue( taskList ) ); + item->setData( ObjectUIDRole, taskList->uid() ); + + if ( Settings::self()->taskLists().contains( taskList->uid() ) ) { +@@ -749,12 +749,12 @@ void SettingsDialog::gam_objectsListRece + + void SettingsDialog::gam_objectModified( Reply *reply ) + { +- QList< KGoogle::Object * > objects = reply->replyData(); ++ QList< KGAPI::Object * > objects = reply->replyData(); + + if ( reply->serviceName() == "Calendar" ) { + +- Q_FOREACH ( KGoogle::Object * object, objects ) { +- KGoogle::Objects::Calendar *calendar = static_cast< KGoogle::Objects::Calendar * >( object ); ++ Q_FOREACH ( KGAPI::Object * object, objects ) { ++ KGAPI::Objects::Calendar *calendar = static_cast< KGAPI::Objects::Calendar * >( object ); + QListWidgetItem *item = 0; + + for ( int i = 0; i < m_ui->calendarsList->count(); i++ ) { +@@ -773,7 +773,7 @@ void SettingsDialog::gam_objectModified( + + item->setText( calendar->title() ); + item->setData( ObjectUIDRole, calendar->uid() ); +- item->setData( KGoogleObjectRole, qVariantFromValue( calendar ) ); ++ item->setData( KGAPIObjectRole, qVariantFromValue( calendar ) ); + } + + m_ui->calendarsBox->setEnabled( true ); +@@ -781,8 +781,8 @@ void SettingsDialog::gam_objectModified( + + } else if ( reply->serviceName() == "Tasks" ) { + +- Q_FOREACH ( KGoogle::Object * object, objects ) { +- KGoogle::Objects::TaskList *taskList = static_cast< KGoogle::Objects::TaskList * >( object ); ++ Q_FOREACH ( KGAPI::Object * object, objects ) { ++ KGAPI::Objects::TaskList *taskList = static_cast< KGAPI::Objects::TaskList * >( object ); + QListWidgetItem *item = 0; + + for ( int i = 0; i < m_ui->tasksList->count(); i++ ) { +@@ -801,7 +801,7 @@ void SettingsDialog::gam_objectModified( + + item->setText( taskList->title() ); + item->setData( ObjectUIDRole, taskList->uid() ); +- item->setData( KGoogleObjectRole, qVariantFromValue( taskList ) ); ++ item->setData( KGAPIObjectRole, qVariantFromValue( taskList ) ); + + } + m_ui->tasksBox->setEnabled( true ); + +--- a/resources/google/calendar/settingsdialog.h ++++ b/resources/google/calendar/settingsdialog.h +@@ -22,13 +22,13 @@ + #include + #include + +-#include ++#include + + namespace Ui { + class SettingsDialog; + } + +-namespace KGoogle { ++namespace KGAPI { + class Reply; + class AccessManager; + +@@ -40,7 +40,7 @@ namespace Objects { + + class QListWidgetItem; + +-using namespace KGoogle; ++using namespace KGAPI; + + class SettingsDialog : public KDialog + { +@@ -63,19 +63,19 @@ class SettingsDialog : public KDialog + void removeTaskListClicked(); + void reloadTaskListsClicked(); + +- void gam_objectsListReceived( KGoogle::Reply *reply ); +- void gam_objectCreated( KGoogle::Reply *reply ); +- void gam_objectModified( KGoogle::Reply *reply ); ++ void gam_objectsListReceived( KGAPI::Reply *reply ); ++ void gam_objectCreated( KGAPI::Reply *reply ); ++ void gam_objectModified( KGAPI::Reply *reply ); + +- void addCalendar( KGoogle::Objects::Calendar *calendar ); +- void editCalendar( KGoogle::Objects::Calendar *calendar ); ++ void addCalendar( KGAPI::Objects::Calendar *calendar ); ++ void editCalendar( KGAPI::Objects::Calendar *calendar ); + +- void addTaskList( KGoogle::Objects::TaskList *taskList ); +- void editTaskList( KGoogle::Objects::TaskList *taskList ); ++ void addTaskList( KGAPI::Objects::TaskList *taskList ); ++ void editTaskList( KGAPI::Objects::TaskList *taskList ); + + void saveSettings(); + +- void error( KGoogle::Error code, const QString &msg ); ++ void error( KGAPI::Error code, const QString &msg ); + + private: + Ui::SettingsDialog *m_ui; + +--- a/resources/google/calendar/tasklisteditor.cpp ++++ b/resources/google/calendar/tasklisteditor.cpp +@@ -18,7 +18,7 @@ + #include "tasklisteditor.h" + #include "ui_tasklist_editor.h" + +-using namespace KGoogle::Objects; ++using namespace KGAPI::Objects; + + TasklistEditor::TasklistEditor( TaskList *taskList ): + QDialog(), +@@ -43,7 +43,7 @@ TasklistEditor::~TasklistEditor() + void TasklistEditor::accepted() + { + if ( !m_taskList ) { +- m_taskList = new KGoogle::Objects::TaskList; ++ m_taskList = new KGAPI::Objects::TaskList; + } + + m_taskList->setTitle( m_ui->nameEdit->text() ); + +--- a/resources/google/calendar/tasklisteditor.h ++++ b/resources/google/calendar/tasklisteditor.h +@@ -20,7 +20,7 @@ + + #include + +-#include ++#include + + namespace Ui { + class TaskListEditor; +@@ -31,18 +31,18 @@ class TasklistEditor : public QDialog + Q_OBJECT + + public: +- explicit TasklistEditor( KGoogle::Objects::TaskList *taskList = 0 ); ++ explicit TasklistEditor( KGAPI::Objects::TaskList *taskList = 0 ); + + virtual ~TasklistEditor(); + + Q_SIGNALS: +- void accepted( KGoogle::Objects::TaskList *taskList ); ++ void accepted( KGAPI::Objects::TaskList *taskList ); + + private Q_SLOTS: + void accepted(); + + private: +- KGoogle::Objects::TaskList *m_taskList; ++ KGAPI::Objects::TaskList *m_taskList; + Ui::TaskListEditor *m_ui; + }; + + +--- a/resources/google/calendar/ui/settingsdialog.ui ++++ b/resources/google/calendar/ui/settingsdialog.ui +@@ -72,7 +72,7 @@ + + + +- ++ + + + 0 +@@ -194,9 +194,9 @@ + + + +- KGoogle::Ui::AccountsCombo ++ KGAPI::Ui::AccountsCombo + QComboBox +-
libkgoogle/ui/accountscombo.h
++
libkgapi/ui/accountscombo.h
+ + + + +--- a/resources/google/contacts/CMakeLists.txt ++++ b/resources/google/contacts/CMakeLists.txt +@@ -30,7 +30,7 @@ target_link_libraries(akonadi_googlecont + ${QT_QTNETWORK_LIBRARY} + ${KDE4_KDECORE_LIBS} + ${KDE4_KIO_LIBS} +- ${LibKGoogle_LIBRARY} ++ ${LibKGAPI_LIBRARY} + ) + + install(TARGETS akonadi_googlecontacts_resource ${INSTALL_TARGETS_DEFAULT_ARGS}) + +--- a/resources/google/contacts/contactsresource.cpp ++++ b/resources/google/contacts/contactsresource.cpp +@@ -41,16 +41,16 @@ + #include + #include + +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + + using namespace Akonadi; +-using namespace KGoogle; ++using namespace KGAPI; + + #define RootCollection "root" + #define MyContacts "myContacts" +@@ -69,14 +69,14 @@ ContactsResource::ContactsResource( cons + Auth *auth = Auth::instance(); + auth->init( "Akonadi Google", Settings::self()->clientId(), Settings::self()->clientSecret() ); + +- m_gam = new KGoogle::AccessManager(); ++ m_gam = new KGAPI::AccessManager(); + m_photoNam = new KIO::Integration::AccessManager( this ); + +- connect( m_gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(replyReceived(KGoogle::Reply*)) ); ++ connect( m_gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(replyReceived(KGAPI::Reply*)) ); + +- connect( m_gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect( m_gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + connect( this, SIGNAL(abortRequested()), + this, SLOT(slotAbortRequested()) ); + connect( this, SIGNAL(reloadConfiguration()), +@@ -164,7 +164,7 @@ Account::Ptr ContactsResource::getAccoun + Auth *auth = Auth::instance(); + try { + m_account = auth->getAccount( Settings::self()->account() ); +- } catch ( KGoogle::Exception::BaseException &e ) { ++ } catch ( KGAPI::Exception::BaseException &e ) { + Q_EMIT status( Broken, e.what() ); + return Account::Ptr(); + } +@@ -205,8 +205,8 @@ bool ContactsResource::retrieveItem( con + + QUrl url( Services::Contacts::fetchContactUrl( account->accountName(), item.remoteId() ) ); + +- KGoogle::Request *request; +- request = new KGoogle::Request( url, KGoogle::Request::Fetch, "Contacts", account ); ++ KGAPI::Request *request; ++ request = new KGAPI::Request( url, KGAPI::Request::Fetch, "Contacts", account ); + request->setProperty( "Item", QVariant::fromValue( item ) ); + + m_gam->sendRequest( request ); +@@ -278,7 +278,7 @@ void ContactsResource::initialItemsFetch + + Collection collection = job->property( "Collection" ).value< Collection >(); + +- QUrl url = KGoogle::Services::Contacts::fetchAllContactsUrl( account->accountName(), true ); ++ QUrl url = KGAPI::Services::Contacts::fetchAllContactsUrl( account->accountName(), true ); + + QString lastSync = collection.remoteRevision(); + if ( !lastSync.isEmpty() ) { +@@ -333,8 +333,8 @@ void ContactsResource::itemAdded( const + "term=\"http://schemas.google.com/contact/2008#contact\"/>" ); + data.append( "" ); + +- KGoogle::Request *request; +- request = new KGoogle::Request( Services::Contacts::createContactUrl( account->accountName() ), ++ KGAPI::Request *request; ++ request = new KGAPI::Request( Services::Contacts::createContactUrl( account->accountName() ), + Request::Create, "Contacts", account ); + request->setRequestData( data, "application/atom+xml" ); + request->setProperty( "Item", QVariant::fromValue( item ) ); +@@ -375,9 +375,9 @@ void ContactsResource::itemChanged( cons + "term=\"http://schemas.google.com/contact/2008#contact\"/>" ); + data.append( "" ); + +- KGoogle::Request *request; ++ KGAPI::Request *request; + request = +- new KGoogle::Request( ++ new KGAPI::Request( + Services::Contacts::updateContactUrl( account->accountName(), item.remoteId() ), + Request::Update, "Contacts", account ); + request->setRequestData( data, "application/atom+xml" ); +@@ -430,9 +430,9 @@ void ContactsResource::itemMoved( const + "term=\"http://schemas.google.com/contact/2008#contact\"/>" ); + data.append( "" ); + +- KGoogle::Request *request; ++ KGAPI::Request *request; + request = +- new KGoogle::Request( ++ new KGAPI::Request( + Services::Contacts::updateContactUrl( account->accountName(), item.remoteId() ), + Request::Update, "Contacts", account ); + request->setRequestData( data, "application/atom+xml" ); +@@ -449,9 +449,9 @@ void ContactsResource::itemRemoved( cons + return; + } + +- KGoogle::Request *request; ++ KGAPI::Request *request; + request = +- new KGoogle::Request( ++ new KGAPI::Request( + Services::Contacts::removeContactUrl( account->accountName(), item.remoteId() ), + Request::Remove, "Contacts", account ); + request->setProperty( "Item", QVariant::fromValue( item ) ); +@@ -459,7 +459,7 @@ void ContactsResource::itemRemoved( cons + m_gam->sendRequest( request ); + } + +-void ContactsResource::replyReceived( KGoogle::Reply *reply ) ++void ContactsResource::replyReceived( KGAPI::Reply *reply ) + { + switch ( reply->requestType() ) { + case Request::Fetch: +@@ -500,9 +500,9 @@ void ContactsResource::contactListReceiv + Item::List changed; + + FetchListJob *fetchJob = dynamic_cast< FetchListJob * >( job ); +- QList< KGoogle::Object * > objects = fetchJob->items(); ++ QList< KGAPI::Object * > objects = fetchJob->items(); + +- Q_FOREACH ( KGoogle::Object * object, objects ) { ++ Q_FOREACH ( KGAPI::Object * object, objects ) { + + Item item; + Objects::Contact *contact = static_cast< Objects::Contact * >( object ); +@@ -543,14 +543,14 @@ void ContactsResource::contactListReceiv + modifyJob->setAutoDelete( true ); + } + +-void ContactsResource::contactReceived( KGoogle::Reply *reply ) ++void ContactsResource::contactReceived( KGAPI::Reply *reply ) + { +- if ( reply->error() != KGoogle::OK ) { ++ if ( reply->error() != KGAPI::OK ) { + cancelTask( i18n( "Failed to fetch contact" ) ); + return; + } + +- QList< KGoogle::Object * > data = reply->replyData(); ++ QList< KGAPI::Object * > data = reply->replyData(); + if ( data.length() != 1 ) { + kWarning() << "Server send " << data.length() << "items, which is not OK"; + cancelTask( i18n( "Failed to create a contact" ) ); +@@ -575,14 +575,14 @@ void ContactsResource::contactReceived( + } + } + +-void ContactsResource::contactCreated( KGoogle::Reply *reply ) ++void ContactsResource::contactCreated( KGAPI::Reply *reply ) + { +- if ( reply->error() != KGoogle::Created ) { ++ if ( reply->error() != KGAPI::Created ) { + cancelTask( i18n( "Failed to create a contact" ) ); + return; + } + +- QList< KGoogle::Object * > data = reply->replyData(); ++ QList< KGAPI::Object * > data = reply->replyData(); + if ( data.length() != 1 ) { + kWarning() << "Server send " << data.length() << "items, which is not OK"; + cancelTask( i18n( "Failed to create a contact" ) ); +@@ -604,14 +604,14 @@ void ContactsResource::contactCreated( K + updatePhoto( item ); + } + +-void ContactsResource::contactUpdated( KGoogle::Reply *reply ) ++void ContactsResource::contactUpdated( KGAPI::Reply *reply ) + { +- if ( reply->error() != KGoogle::OK ) { ++ if ( reply->error() != KGAPI::OK ) { + cancelTask( i18n( "Failed to update contact" ) ); + return; + } + +- QList< KGoogle::Object * > data = reply->replyData(); ++ QList< KGAPI::Object * > data = reply->replyData(); + if ( data.length() != 1 ) { + kWarning() << "Server send " << data.length() << "items, which is not OK"; + cancelTask( i18n( "Failed to update a contact" ) ); +@@ -629,9 +629,9 @@ void ContactsResource::contactUpdated( K + updatePhoto( item ); + } + +-void ContactsResource::contactRemoved( KGoogle::Reply *reply ) ++void ContactsResource::contactRemoved( KGAPI::Reply *reply ) + { +- if ( reply->error() != KGoogle::OK ) { ++ if ( reply->error() != KGAPI::OK ) { + cancelTask( i18n( "Failed to remove contact" ) ); + return; + } + +--- a/resources/google/contacts/contactsresource.h ++++ b/resources/google/contacts/contactsresource.h +@@ -24,10 +24,10 @@ + #include + #include + +-#include +-#include ++#include ++#include + +-namespace KGoogle { ++namespace KGAPI { + class AccessManager; + class Reply; + class Request; +@@ -36,7 +36,7 @@ namespace KGoogle { + class QNetworkAccessManager; + class QNetworkReply; + +-using namespace KGoogle; ++using namespace KGAPI; + + class ContactsResource: public Akonadi::ResourceBase, + public Akonadi::AgentBase::ObserverV2 +@@ -71,7 +71,7 @@ class ContactsResource: public Akonadi:: + void aboutToQuit(); + + private Q_SLOTS: +- void error( KGoogle::Error errCode, const QString &msg ); ++ void error( KGAPI::Error errCode, const QString &msg ); + + void slotAbortRequested(); + +@@ -80,12 +80,12 @@ class ContactsResource: public Akonadi:: + + void photoRequestFinished( QNetworkReply *reply ); + +- void replyReceived( KGoogle::Reply *reply ); ++ void replyReceived( KGAPI::Reply *reply ); + +- void contactReceived( KGoogle::Reply *reply ); +- void contactUpdated( KGoogle::Reply *reply ); +- void contactCreated( KGoogle::Reply *reply ); +- void contactRemoved( KGoogle::Reply *reply ); ++ void contactReceived( KGAPI::Reply *reply ); ++ void contactUpdated( KGAPI::Reply *reply ); ++ void contactCreated( KGAPI::Reply *reply ); ++ void contactRemoved( KGAPI::Reply *reply ); + + void emitPercent( KJob *job, ulong progress ); + +@@ -97,9 +97,9 @@ class ContactsResource: public Akonadi:: + + Account::Ptr getAccount(); + +- KGoogle::Account::Ptr m_account; ++ KGAPI::Account::Ptr m_account; + +- KGoogle::AccessManager *m_gam; ++ KGAPI::AccessManager *m_gam; + QNetworkAccessManager *m_photoNam; + + QMap< QString, Akonadi::Collection > m_collections; + +--- a/resources/google/contacts/settingsdialog.cpp ++++ b/resources/google/contacts/settingsdialog.cpp +@@ -22,13 +22,13 @@ + #include + #include + +-#include +-#include ++#include ++#include + +-using namespace KGoogle; ++using namespace KGAPI; + + enum { +- KGoogleObjectRole = Qt::UserRole, ++ KGAPIObjectRole = Qt::UserRole, + ObjectUIDRole + }; + +@@ -38,7 +38,7 @@ SettingsDialog::SettingsDialog( WId wind + { + KWindowSystem::setMainWindow( this, windowId ); + +- qRegisterMetaType( "Contacts" ); ++ qRegisterMetaType( "Contacts" ); + + this->setButtons( Ok | Cancel ); + +@@ -58,8 +58,8 @@ SettingsDialog::SettingsDialog( WId wind + connect( m_ui->removeAccountBtn, SIGNAL(clicked(bool)), + this, SLOT(removeAccountClicked()) ); + +- KGoogle::Auth *auth = KGoogle::Auth::instance(); +- connect( auth, SIGNAL(authenticated(KGoogle::Account::Ptr&)), ++ KGAPI::Auth *auth = KGAPI::Auth::instance(); ++ connect( auth, SIGNAL(authenticated(KGAPI::Account::Ptr&)), + this, SLOT(reloadAccounts()) ); + + reloadAccounts(); +@@ -78,9 +78,9 @@ void SettingsDialog::saveSettings() + Settings::self()->writeConfig(); + } + +-void SettingsDialog::error( KGoogle::Error errCode, const QString &msg ) ++void SettingsDialog::error( KGAPI::Error errCode, const QString &msg ) + { +- if ( errCode == KGoogle::OK ) { ++ if ( errCode == KGAPI::OK ) { + return; + } + +@@ -107,22 +107,22 @@ void SettingsDialog::reloadAccounts() + + void SettingsDialog::addAccountClicked() + { +- KGoogle::Auth *auth = KGoogle::Auth::instance(); ++ KGAPI::Auth *auth = KGAPI::Auth::instance(); + +- KGoogle::Account::Ptr account( new KGoogle::Account() ); ++ KGAPI::Account::Ptr account( new KGAPI::Account() ); + account->addScope( Services::Contacts::ScopeUrl ); + + try { + auth->authenticate( account, true ); + updateButtons(); +- } catch ( KGoogle::Exception::BaseException &e ) { ++ } catch ( KGAPI::Exception::BaseException &e ) { + KMessageBox::error( this, e.what() ); + } + } + + void SettingsDialog::removeAccountClicked() + { +- KGoogle::Account::Ptr account = m_ui->accountsCombo->currentAccount(); ++ KGAPI::Account::Ptr account = m_ui->accountsCombo->currentAccount(); + + if ( account.isNull() ) { + return; +@@ -142,12 +142,12 @@ void SettingsDialog::removeAccountClicke + return; + } + +- KGoogle::Auth *auth = KGoogle::Auth::instance(); ++ KGAPI::Auth *auth = KGAPI::Auth::instance(); + + try { + auth->revoke( account ); + updateButtons(); +- } catch ( KGoogle::Exception::BaseException &e ) { ++ } catch ( KGAPI::Exception::BaseException &e ) { + KMessageBox::error( this, e.what() ); + } + + +--- a/resources/google/contacts/settingsdialog.h ++++ b/resources/google/contacts/settingsdialog.h +@@ -20,7 +20,7 @@ + + #include + +-#include ++#include + + namespace Ui { + class SettingsDialog; +@@ -40,7 +40,7 @@ class SettingsDialog : public KDialog + void removeAccountClicked(); + void reloadAccounts(); + +- void error( KGoogle::Error errCode, const QString &msg ); ++ void error( KGAPI::Error errCode, const QString &msg ); + void saveSettings(); + + private: + +--- a/resources/google/contacts/ui/settingsdialog.ui ++++ b/resources/google/contacts/ui/settingsdialog.ui +@@ -21,7 +21,7 @@ + + + +- ++ + + + 0 +@@ -51,9 +51,9 @@ + + + +- KGoogle::Ui::AccountsCombo ++ KGAPI::Ui::AccountsCombo + QComboBox +-
libkgoogle/ui/accountscombo.h
++
libkgapi/ui/accountscombo.h
+ + + + diff --git a/kde-unstable/kdepimlibs/PKGBUILD b/kde-unstable/kdepimlibs/PKGBUILD index e82ec55d3..68bd3877c 100644 --- a/kde-unstable/kdepimlibs/PKGBUILD +++ b/kde-unstable/kdepimlibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160077 2012-05-29 22:07:02Z andrea $ +# $Id: PKGBUILD 160315 2012-05-31 22:18:14Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdepimlibs pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kdepimlibs' @@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl') install='kdepimlibs.install' source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('ae808daa00e5d8a5fa3f62777e311391d2412c7c') +sha1sums=('6249c7a8331aaa069e932acdc72a94ac0d75d6db') build() { cd "${srcdir}" diff --git a/kde-unstable/kdesdk-kate/PKGBUILD b/kde-unstable/kdesdk-kate/PKGBUILD index 172a0e987..4a7028891 100644 --- a/kde-unstable/kdesdk-kate/PKGBUILD +++ b/kde-unstable/kdesdk-kate/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160087 2012-05-29 22:23:54Z andrea $ +# $Id: PKGBUILD 160322 2012-05-31 22:22:56Z andrea $ # Maintainer: Andrea Scarpino pkgbase=kdesdk-kate @@ -6,13 +6,13 @@ pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') pkgver=4.8.80 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4') source=("http://download.kde.org/unstable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') -sha1sums=('4f757fe5fd2a49a0119b8cafb072d8e742189029' +sha1sums=('b4031257ba5e0873e887343ca3d198e211934502' '0a928253bd2077f0264d96a6c8823c69c47b6a8d') build() { diff --git a/kde-unstable/libkgapi/PKGBUILD b/kde-unstable/libkgapi/PKGBUILD new file mode 100644 index 000000000..67c200fa9 --- /dev/null +++ b/kde-unstable/libkgapi/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 160270 2012-05-31 20:24:46Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=libkgapi +pkgver=0.4.0 +pkgrel=1 +pkgdesc="A KDE-based library for accessing various Google services via their public API" +url='https://projects.kde.org/projects/kdereview/libkgoogle' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdepimlibs' 'qjson') +makedepends=('cmake' 'automoc4' 'boost') +replaces=('akonadi-google' 'libkgoogle') +conflicts=('akonadi-google' 'libkgoogle') +source=("http://www.progdan.cz/wp-content/uploads/${pkgname}-${pkgver}.tar.bz2") +md5sums=('90c44fd9456a6e34a8375f98250ad7cc') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/nepomuk-core/PKGBUILD b/kde-unstable/nepomuk-core/PKGBUILD index 066760b54..1f9847267 100644 --- a/kde-unstable/nepomuk-core/PKGBUILD +++ b/kde-unstable/nepomuk-core/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160079 2012-05-29 22:12:19Z andrea $ +# $Id: PKGBUILD 160316 2012-05-31 22:18:54Z andrea $ # Maintainer: Andrea Scarpino pkgname=nepomuk-core pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4' 'doxygen') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('6d1a84f51018476b2fe05b47c265bd6d182335aa') +sha1sums=('023f241f61d778cee16d29fbc64968a6925e42ee') build() { cd "${srcdir}" @@ -30,7 +30,4 @@ package() { # Fix the python shebang sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen - - # Fix conflict - rm "${pkgdir}"/usr/bin/nepomuk-rcgen } -- cgit v1.2.3-54-g00ecf From d915cad658736d96368750201c34df752048751a Mon Sep 17 00:00:00 2001 From: root Date: Sun, 3 Jun 2012 00:04:14 +0000 Subject: Sun Jun 3 00:04:13 UTC 2012 --- community-testing/awesome/01-fix_glib2_build.patch | 31 + community-testing/awesome/PKGBUILD | 64 ++ community-testing/awesome/awesome.desktop | 7 + community-testing/i3-wm/PKGBUILD | 58 ++ community-testing/perl-berkeleydb/PKGBUILD | 4 +- community-testing/python-bsddb/LICENSE | 19 + community-testing/python-bsddb/PKGBUILD | 49 + community/0ad/PKGBUILD | 2 +- community/eeze-svn/PKGBUILD | 4 +- community/egoboo/PKGBUILD | 7 +- community/enet/PKGBUILD | 19 +- community/flightgear/PKGBUILD | 4 +- community/libcec/PKGBUILD | 10 +- community/libmicrohttpd/PKGBUILD | 6 +- community/libvirt/PKGBUILD | 8 +- community/openttd/PKGBUILD | 6 +- community/pcsclite/PKGBUILD | 8 +- community/soundkonverter/PKGBUILD | 6 +- community/spacefm/PKGBUILD | 4 +- community/speed-dreams/PKGBUILD | 4 +- core/bash/PKGBUILD | 8 +- core/btrfs-progs/PKGBUILD | 6 +- core/btrfs-progs/initcpio-install-btrfs | 6 +- core/cryptsetup/PKGBUILD | 8 +- core/cryptsetup/encrypt_hook | 17 +- core/cryptsetup/encrypt_install | 17 +- core/dmraid/PKGBUILD | 6 +- core/dmraid/dmraid_install | 11 +- core/heirloom-mailx/PKGBUILD | 4 +- core/lvm2/PKGBUILD | 14 +- core/lvm2/lvm2_hook | 39 +- core/lvm2/lvm2_install | 32 +- core/mkinitcpio-nfs-utils/PKGBUILD | 16 +- core/mkinitcpio-nfs-utils/initcpio-hook-net | 90 ++ core/mkinitcpio-nfs-utils/initcpio-install-net | 107 ++ core/procps-ng/PKGBUILD | 29 +- core/sudo/PKGBUILD | 8 +- core/util-linux/PKGBUILD | 16 +- core/vi/PKGBUILD | 4 +- .../0001-udev-remove-deprecated-function.patch | 27 + extra/bluez/PKGBUILD | 14 +- extra/clutter-gtk2/PKGBUILD | 5 +- extra/consolekit/PKGBUILD | 12 +- extra/gvfs/PKGBUILD | 4 +- extra/libatasmart/PKGBUILD | 6 +- extra/libcanberra/PKGBUILD | 6 +- extra/mesa/PKGBUILD | 12 +- extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch | 46 + extra/mpd/PKGBUILD | 12 +- extra/mpd/install | 5 +- extra/mpd/rc.d | 2 - extra/mpd/tmpfiles.d | 1 + ...emove-usage-of-deprecated-udev_get_-_path.patch | 80 ++ extra/pulseaudio/PKGBUILD | 12 +- extra/pulseaudio/pulseaudio.install | 16 +- extra/slim/PKGBUILD | 7 +- extra/slim/slim.service | 3 +- extra/system-config-printer/PKGBUILD | 12 +- extra/udisks/PKGBUILD | 10 +- extra/vlc/PKGBUILD | 4 +- extra/xf86-video-ati/PKGBUILD | 6 +- extra/xf86-video-intel/PKGBUILD | 6 +- extra/xf86-video-nouveau/PKGBUILD | 6 +- extra/xorg-server/PKGBUILD | 8 +- kde-unstable/kdeadmin/PKGBUILD | 6 +- kde-unstable/kdebase-konsole/PKGBUILD | 6 +- kde-unstable/kdebase-workspace/PKGBUILD | 6 +- kde-unstable/kdebase/PKGBUILD | 6 +- kde-unstable/kdeedu-kalgebra/PKGBUILD | 6 +- kde-unstable/kdeedu-kalzium/PKGBUILD | 6 +- kde-unstable/kdeedu-ktouch/PKGBUILD | 6 +- kde-unstable/kdeedu-marble/PKGBUILD | 6 +- kde-unstable/kdeedu-pairs/PKGBUILD | 6 +- kde-unstable/kdeedu-rocs/PKGBUILD | 6 +- kde-unstable/kdegames/PKGBUILD | 6 +- kde-unstable/kdegraphics-gwenview/PKGBUILD | 6 +- kde-unstable/kdegraphics-mobipocket/PKGBUILD | 6 +- kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD | 6 +- kde-unstable/kdemultimedia-juk/PKGBUILD | 6 +- kde-unstable/kdemultimedia-kmix/PKGBUILD | 6 +- kde-unstable/kdenetwork/PKGBUILD | 6 +- kde-unstable/kdeplasma-addons/PKGBUILD | 6 +- kde-unstable/kdesdk/PKGBUILD | 6 +- kde-unstable/libkcddb/PKGBUILD | 6 +- kde-unstable/libkdeedu/PKGBUILD | 6 +- libre/audacious-plugins-libre/PKGBUILD | 6 +- libre/xchat-libre/PKGBUILD | 57 +- libre/xchat-libre/no-firefox.patch | 2 +- libre/xchat-libre/remove-non-free-suggestion.patch | 2 +- libre/xchat-libre/xchat-2.8.8-glib-2.31.patch | 62 ++ libre/xchat-libre/xchat-2.8.8-libnotify07.patch | 1 - .../xchat-2.8.8-link-against-libnotify.patch | 1 - libre/xchat-libre/xchat.install | 11 + multilib-testing/lib32-xcb-util/PKGBUILD | 35 + multilib/lib32-mesa/PKGBUILD | 18 +- .../lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch | 44 + testing/db/PKGBUILD | 32 + testing/db/db.install | 5 + testing/imagemagick/PKGBUILD | 8 +- testing/libusbx/PKGBUILD | 33 + testing/mkinitcpio-busybox/PKGBUILD | 34 + testing/mkinitcpio-busybox/config | 1020 ++++++++++++++++++++ testing/openldap/PKGBUILD | 102 ++ testing/openldap/mutex-end-of-struct-sigsegv.patch | 293 ++++++ testing/openldap/ntlm.patch | 230 +++++ testing/openldap/openldap.install | 20 + testing/openldap/slapd | 49 + testing/openldap/slapd.default | 6 + testing/startup-notification/PKGBUILD | 28 + testing/xcb-util-image/LICENSE | 267 +++++ testing/xcb-util-image/PKGBUILD | 37 + testing/xcb-util-keysyms/LICENSE | 267 +++++ testing/xcb-util-keysyms/PKGBUILD | 37 + testing/xcb-util-wm/LICENSE | 267 +++++ testing/xcb-util-wm/PKGBUILD | 37 + testing/xcb-util/LICENSE | 267 +++++ testing/xcb-util/PKGBUILD | 38 + testing/xf86-video-intel/PKGBUILD | 6 +- 118 files changed, 4185 insertions(+), 343 deletions(-) create mode 100644 community-testing/awesome/01-fix_glib2_build.patch create mode 100644 community-testing/awesome/PKGBUILD create mode 100644 community-testing/awesome/awesome.desktop create mode 100644 community-testing/i3-wm/PKGBUILD create mode 100644 community-testing/python-bsddb/LICENSE create mode 100644 community-testing/python-bsddb/PKGBUILD create mode 100644 core/mkinitcpio-nfs-utils/initcpio-hook-net create mode 100644 core/mkinitcpio-nfs-utils/initcpio-install-net create mode 100644 extra/bluez/0001-udev-remove-deprecated-function.patch create mode 100644 extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch create mode 100644 extra/mpd/tmpfiles.d create mode 100644 extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch create mode 100644 libre/xchat-libre/xchat-2.8.8-glib-2.31.patch create mode 100644 libre/xchat-libre/xchat.install create mode 100644 multilib-testing/lib32-xcb-util/PKGBUILD create mode 100644 multilib/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch create mode 100644 testing/db/PKGBUILD create mode 100644 testing/db/db.install create mode 100644 testing/libusbx/PKGBUILD create mode 100644 testing/mkinitcpio-busybox/PKGBUILD create mode 100644 testing/mkinitcpio-busybox/config create mode 100644 testing/openldap/PKGBUILD create mode 100644 testing/openldap/mutex-end-of-struct-sigsegv.patch create mode 100644 testing/openldap/ntlm.patch create mode 100644 testing/openldap/openldap.install create mode 100755 testing/openldap/slapd create mode 100644 testing/openldap/slapd.default create mode 100644 testing/startup-notification/PKGBUILD create mode 100644 testing/xcb-util-image/LICENSE create mode 100644 testing/xcb-util-image/PKGBUILD create mode 100644 testing/xcb-util-keysyms/LICENSE create mode 100644 testing/xcb-util-keysyms/PKGBUILD create mode 100644 testing/xcb-util-wm/LICENSE create mode 100644 testing/xcb-util-wm/PKGBUILD create mode 100644 testing/xcb-util/LICENSE create mode 100644 testing/xcb-util/PKGBUILD (limited to 'kde-unstable') diff --git a/community-testing/awesome/01-fix_glib2_build.patch b/community-testing/awesome/01-fix_glib2_build.patch new file mode 100644 index 000000000..aeab63fbb --- /dev/null +++ b/community-testing/awesome/01-fix_glib2_build.patch @@ -0,0 +1,31 @@ +From d3d8160e273b56d0262d2570cfa6bcb76b9ea771 Mon Sep 17 00:00:00 2001 +From: Thomas Moschny +Date: Wed, 14 Dec 2011 20:00:53 +0100 +Subject: [PATCH] Fix build with glib2 2.31.0 + +Starting with glib2 2.31.0, It is no longer possible to +include individual headers (like "ghash.h") -- you must +#include . + +Signed-off-by: Thomas Moschny +Signed-off-by: Uli Schlachter +--- + spawn.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/spawn.c b/spawn.c +index 3c8cf07..a6d6c5e 100644 +--- a/spawn.c ++++ b/spawn.c +@@ -24,7 +24,7 @@ + #include + #include + +-#include ++#include + + #include "spawn.h" + #include "screen.h" +-- +1.7.2.5 + diff --git a/community-testing/awesome/PKGBUILD b/community-testing/awesome/PKGBUILD new file mode 100644 index 000000000..e9c275d33 --- /dev/null +++ b/community-testing/awesome/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 71724 2012-06-01 20:08:27Z dreisner $ +# Maintainer: Sébastien Luttringer +# Contributor: xduugu +# Contributor: Ronald van Haren +# Contributor: Vesa Kaihlavirta + +pkgname=awesome +pkgver=3.4.11 +pkgrel=5 +pkgdesc='Highly configurable framework window manager' +arch=('i686' 'x86_64') +url='http://awesome.naquadah.org/' +license=('GPL2') +depends=( + 'cairo' + 'dbus' + 'imlib2' + 'libev' + 'libxdg-basedir' + 'lua' + 'pango' + 'startup-notification' + 'xcb-util-image' + 'xcb-util-keysyms' + 'xcb-util-wm' + 'xorg-xmessage' +) +makedepends=( + 'asciidoc' + 'cmake' + 'docbook-xsl' + 'doxygen' + 'gperf' + 'imagemagick' + 'luadoc' + 'xmlto' +) +optdepends=( + 'rlwrap: readline support for awesome-client' + 'feh: image background setter for awsetbg' +) +provides=('notification-daemon') +source=("$url/download/$pkgname-$pkgver.tar.xz" + "$pkgname.desktop" + '01-fix_glib2_build.patch') +md5sums=('d6aa71334b5cd4ef63ce69d6c612ecf2' + '0fdbeec43d211c6750041d7e37611a6a' + 'baa179074c36e26ef156ebb2060bfd5c') + +build() { + cd $pkgname-$pkgver + # to remove in 3.4.12 + patch -N -p1 -i ../01-fix_glib2_build.patch + make CMAKE_ARGS=' -DPREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE' +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + # install desktop file so you can start awesome from your login manager + install -Dm644 ../awesome.desktop "$pkgdir/usr/share/xsessions/awesome.desktop" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/awesome/awesome.desktop b/community-testing/awesome/awesome.desktop new file mode 100644 index 000000000..453399c6e --- /dev/null +++ b/community-testing/awesome/awesome.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Awesome +Comment=Highly configurable framework window manager +Type=XSession +Exec=awesome +TryExec=awesome diff --git a/community-testing/i3-wm/PKGBUILD b/community-testing/i3-wm/PKGBUILD new file mode 100644 index 000000000..a6ae0813f --- /dev/null +++ b/community-testing/i3-wm/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 71726 2012-06-01 20:08:31Z dreisner $ +# Maintainer: Thorsten Töpper + +pkgname=i3-wm +_pkgsourcename=i3 +pkgver=4.2 +pkgrel=2 +pkgdesc="An improved dynamic tiling window manager" +arch=('i686' 'x86_64') +url="http://i3wm.org/" +license=('BSD') +replaces=("i3" "i3bar") +groups=("i3") +depends=('libxcursor' 'xcb-util-wm' 'xcb-util-keysyms' 'libev' 'yajl' 'startup-notification' 'pcre') +makedepends=('bison' 'flex') +optdepends=('rxvt-unicode: The terminal emulator used in the default config.' + 'dmenu: As menu.' + 'i3lock: For locking your screen.' + 'i3status: To display systeminformation with a bar.' + 'perl: To migrate your configuration to v4 format.') +options=('docs' '!strip') +source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2") +md5sums=('11b7e5ecdd837341978c72341cb890c6') + +build() { + cd "$srcdir/$_pkgsourcename-$pkgver" + + # In order to avoid problems with bison use only a single process + MAKEFLAGS="-j1" + make +} + +package() { + cd "$srcdir/$_pkgsourcename-$pkgver" + + make DESTDIR="$pkgdir/" install + + install -Dm644 man/i3.1 \ + ${pkgdir}/usr/share/man/man1/i3.1 + install -Dm644 i3bar/doc/i3bar.1 \ + ${pkgdir}/usr/share/man/man1/i3bar.1 + install -Dm644 man/i3-config-wizard.1 \ + ${pkgdir}/usr/share/man/man1/i3-config-wizard.1 + install -Dm644 man/i3-input.1 \ + ${pkgdir}/usr/share/man/man1/i3-input.1 + install -Dm644 man/i3-msg.1 \ + ${pkgdir}/usr/share/man/man1/i3-msg.1 + install -Dm644 man/i3-migrate-config-to-v4.1 \ + ${pkgdir}/usr/share/man/man1/i3-migrate-config-to-v4.1 + install -Dm644 man/i3-nagbar.1 \ + ${pkgdir}/usr/share/man/man1/i3-nagbar.1 + install -Dm644 LICENSE \ + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + make clean +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/perl-berkeleydb/PKGBUILD b/community-testing/perl-berkeleydb/PKGBUILD index 07204c6f0..86975e92c 100644 --- a/community-testing/perl-berkeleydb/PKGBUILD +++ b/community-testing/perl-berkeleydb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71372 2012-05-27 07:39:22Z bluewind $ +# $Id: PKGBUILD 71682 2012-06-01 10:38:28Z stephane $ # Maintainer: Sergej Pupykin # Maintainer: Charles Mauch # Contributor: Francois Charette pkgname=perl-berkeleydb pkgver=0.50 -pkgrel=3 +pkgrel=4 pkgdesc="Interface to Berkeley DB version 2, 3 or 4" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/BerkeleyDB/" diff --git a/community-testing/python-bsddb/LICENSE b/community-testing/python-bsddb/LICENSE new file mode 100644 index 000000000..7d6035775 --- /dev/null +++ b/community-testing/python-bsddb/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2008-2009 Jesus Cea Avion + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/community-testing/python-bsddb/PKGBUILD b/community-testing/python-bsddb/PKGBUILD new file mode 100644 index 000000000..14a706a61 --- /dev/null +++ b/community-testing/python-bsddb/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 71680 2012-06-01 10:25:01Z stephane $ +# Maintainer: Kaiting Chen +# Contributor: Stéphane Gaudreault +# Contributor: Douglas Soares de Andrade +# Contributor: William Rea + +pkgbase=python-bsddb +pkgname=('python2-bsddb' 'python-bsddb') +pkgver=5.3.0 +pkgrel=2 +pkgdesc="Python interface for BerkeleyDB" +license=('MIT') +arch=('i686' 'x86_64') +url="http://www.jcea.es/programacion/pybsddb.htm" +makedepends=('python2-distribute' 'python-distribute') +source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz + LICENSE) +sha1sums=('8743f6d7a2f5471094941a46859723aae88f3915' + 'ef4e4caf618781104dbf5824279ed39d127b4713') + +build () { + cd "${srcdir}" + + cp -r bsddb3-${pkgver}{,-python2} + + # Build python 3 module + cd bsddb3-${pkgver} + python setup.py --berkeley-db=/usr build + + # Build python 2 module + cd ../bsddb3-${pkgver}-python2 + python2 setup.py --berkeley-db=/usr build +} + +package_python2-bsddb() { + depends=('db' 'python2>=2.7') + cd "${srcdir}/bsddb3-${pkgver}-python2" + + python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 + install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + +package_python-bsddb() { + depends=('db' 'python>=3.2') + cd "${srcdir}/bsddb3-${pkgver}" + + python setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 + install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD index 77a3bcae9..00f34cdc7 100644 --- a/community/0ad/PKGBUILD +++ b/community/0ad/PKGBUILD @@ -4,7 +4,7 @@ pkgname=0ad pkgver=a10 _pkgver=r11863-alpha -pkgrel=1 +pkgrel=2 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game" arch=('i686' 'x86_64') url="http://wildfiregames.com/0ad" diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD index 9c38cead6..b5981f918 100644 --- a/community/eeze-svn/PKGBUILD +++ b/community/eeze-svn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 68736 2012-04-01 10:41:08Z rvanharen $ +# $Id: PKGBUILD 71684 2012-06-01 13:04:52Z dreisner $ # Maintainer: Ronald van Haren # Contributor: Ronald van Haren # Contributor: bluebugs pkgname=eeze-svn pkgver=69825 -pkgrel=1 +pkgrel=2 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64') groups=('e17-libs-svn' 'e17-svn') diff --git a/community/egoboo/PKGBUILD b/community/egoboo/PKGBUILD index bbb759c28..7db9c5a46 100644 --- a/community/egoboo/PKGBUILD +++ b/community/egoboo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57902 2011-11-04 09:04:39Z lcarlier $ +# $Id: PKGBUILD 71718 2012-06-01 18:47:50Z ebelanger $ # Maintainer: Laurent Carlier # Maintainer: Sven-Hendrik Haase # Contributor: Arkham @@ -7,7 +7,7 @@ pkgname=egoboo pkgver=2.8.1 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('GPL') pkgdesc="An open-source action RPG/dungeon crawling adventure with OpenGL 3D graphics" @@ -30,6 +30,9 @@ build() { -e 's#games#bin#g' \ game/platform/file_linux.c + # fix linking + sed -i -e 's#-lenet#-lenet -lm#g' game/Makefile + make all } diff --git a/community/enet/PKGBUILD b/community/enet/PKGBUILD index 79d9ad6af..41b97c012 100644 --- a/community/enet/PKGBUILD +++ b/community/enet/PKGBUILD @@ -1,32 +1,27 @@ -# $Id: PKGBUILD 66600 2012-02-26 14:00:34Z lfleischer $ +# $Id: PKGBUILD 71720 2012-06-01 18:47:54Z ebelanger $ # Maintainer: Mateusz Herych # Contributor: Bj?indeijer pkgname=enet -pkgver=1.3.3 -pkgrel=2 +pkgver=1.3.4 +pkgrel=1 pkgdesc='A relatively thin, simple and robust network communication layer on top of UDP.' arch=('i686' 'x86_64') url='http://enet.bespin.org/' license=('custom') depends=('glibc') -options=(!libtool) +options=('!libtool') source=("http://enet.bespin.org/download/${pkgname}-${pkgver}.tar.gz") -md5sums=('4b0b69377fd4511e82e5f0921a942e59') +md5sums=('e5fb0ca3fd3a9fe7eadbcde4d6af1517') build() { cd "${pkgname}-${pkgver}" - - CFLAGS="-fPIC" ./configure --prefix=/usr + CFLAGS+="-fPIC" ./configure --prefix=/usr make - gcc -Wl,-soname,libenet.so.2 -shared -o libenet.so.2 *.o } package() { cd "${pkgname}-${pkgver}" - - make prefix="${pkgdir}/usr" install - - install -m755 libenet.so.2 "${pkgdir}/usr/lib" + make DESTDIR="${pkgdir}" install install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD index cf9f8434c..50ddaec16 100644 --- a/community/flightgear/PKGBUILD +++ b/community/flightgear/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70923 2012-05-19 18:42:10Z spupykin $ +# $Id: PKGBUILD 71686 2012-06-01 13:04:56Z dreisner $ # Maintainer: Sergej Pupykin # Maintainer: William Rea # Contributor: Hans Janssen pkgname=flightgear pkgver=2.6.0 -pkgrel=4 +pkgrel=5 pkgdesc="An open-source, multi-platform flight simulator" arch=(i686 x86_64) depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion') diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD index fc9c0f46c..e14ac932e 100644 --- a/community/libcec/PKGBUILD +++ b/community/libcec/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 70691 2012-05-14 21:28:54Z idevolder $ +# $Id: PKGBUILD 71688 2012-06-01 13:05:00Z dreisner $ # Maintainer: BlackIkeEagle # Contributor: Philippe Cherel pkgname=libcec -pkgver=1.6.2 +pkgver=1.6.3 pkgrel=1 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" arch=('i686' 'x86_64') url="https://github.com/Pulse-Eight/libcec" license=('GPL') -depends=('udev') +depends=('udev' 'lockdev') source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver") -_srcfolder=Pulse-Eight-libcec-e14b158 -sha256sums=('2d853df4478a9b93ef699c7038cf78a97741b1a594996d1df644f2d5e51d6969') +_srcfolder=Pulse-Eight-libcec-ab37938 +sha256sums=('964fb7ad2281b44dacddd57e5cfc16750271492cbbf48291ee487644d69bcb61') options=(!libtool) build() { diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index fb96f797e..acbb0ad93 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64124 2012-02-09 00:56:55Z spupykin $ +# $Id: PKGBUILD 71678 2012-06-01 08:24:00Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Norberto Lopes # Contributor: Kao Dome @@ -6,7 +6,7 @@ # Contributor: Mathias Rohnstock pkgname=libmicrohttpd -pkgver=0.9.19 +pkgver=0.9.20 pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ options=('!libtool') depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('0f4c55ba224ce75b3b993b558e072a6b') +md5sums=('ede6ad4a07a8a0794c42e4ef356ee27c') build() { cd ${pkgname}-${pkgver} diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index a9abeab51..6d6d72484 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71544 2012-05-28 16:19:18Z spupykin $ +# $Id: PKGBUILD 71690 2012-06-01 13:05:20Z dreisner $ # Maintainer: Sergej Pupykin # Contributor: Jonathan Wiersma pkgname=libvirt pkgver=0.9.12 -pkgrel=7 +pkgrel=8 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -87,8 +87,8 @@ package() { mv $pkgdir/etc/sysctl.d/libvirtd $pkgdir/usr/lib/sysctl.d/libvirtd # systemd stuff -# install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt -# mv $pkgdir/lib/* $pkgdir/usr/lib/ + install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf + mv $pkgdir/lib/* $pkgdir/usr/lib/ rm -rf \ $pkgdir/var/run \ diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index a38b7ccca..27c2d5890 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 69766 2012-04-23 09:16:08Z ibiru $ +# $Id: PKGBUILD 71703 2012-06-01 13:23:48Z lcarlier $ # Maintainer: Vesa Kaihlavirta pkgname=openttd -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ install=openttd.install optdepends=('openttd-opengfx: free graphics' 'openttd-opensfx: free soundset') source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") -md5sums=('7f5181fdd5119336ccbe08f47eab78c1') +md5sums=('66b54e0293594aab90085db113cc2dd3') build() { cd ${pkgname}-${pkgver} diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index 714495250..e3984ce0d 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 69074 2012-04-08 23:10:15Z giovanni $ +# $Id: PKGBUILD 71730 2012-06-02 00:19:22Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Daniel Plaza pkgname=pcsclite pkgver=1.8.3 -pkgrel=2 +pkgrel=4 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64') url="https://alioth.debian.org/projects/pcsclite/" license=('BSD') -depends=('python') +depends=('python2' 'systemd-tools') makedepends=('pkg-config') options=('!libtool' '!docs') source=("https://alioth.debian.org/frs/download.php/3706/pcsc-lite-${pkgver}.tar.bz2" @@ -20,6 +20,8 @@ md5sums=('7ad8c97c89f77aab7a00317eb7e811e9' build() { cd "${srcdir}/pcsc-lite-${pkgver}" + sed -i -e "s:python:python2:g" src/spy/pcsc-spy + ./configure --prefix=/usr \ --enable-libudev \ --sysconfdir=/etc \ diff --git a/community/soundkonverter/PKGBUILD b/community/soundkonverter/PKGBUILD index 650fcded0..9692a9a2e 100644 --- a/community/soundkonverter/PKGBUILD +++ b/community/soundkonverter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70533 2012-05-10 17:21:08Z stativ $ +# $Id: PKGBUILD 71704 2012-06-01 13:28:02Z stativ $ # Maintainer: Lukas Jirkovsky # Contributor: Mateusz Herych # Contributor: Eric Belanger # Contributor: Darwin Bautista pkgname=soundkonverter -pkgver=1.5.0 +pkgver=1.6.0 pkgrel=1 pkgdesc="Front-end to various audio converters" arch=('i686' 'x86_64') @@ -31,7 +31,7 @@ optdepends=('cdrkit: cdda2wav backend' 'wavpack: wavpack backend') install=$pkgname.install source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz") -md5sums=('9cb8dcf64bd257965a227d79e3c6e7fb') +md5sums=('1d2a171b1a1c9d186cd5a644ba9fc686') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD index 303105ede..d1e4ae01e 100644 --- a/community/spacefm/PKGBUILD +++ b/community/spacefm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70364 2012-05-05 07:51:43Z bpiotrowski $ +# $Id: PKGBUILD 71694 2012-06-01 13:05:32Z dreisner $ # Maintainer: Bartłomiej Piotrowski # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor: ridikulus_rat pkgname=spacefm pkgver=0.7.6 -pkgrel=2 +pkgrel=3 pkgdesc="A multi-panel tabbed file manager" arch=('i686' 'x86_64') url="http://ignorantguru.github.com/spacefm/" diff --git a/community/speed-dreams/PKGBUILD b/community/speed-dreams/PKGBUILD index 95f702c95..3d17ebfb0 100644 --- a/community/speed-dreams/PKGBUILD +++ b/community/speed-dreams/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69991 2012-04-27 23:56:34Z svenstaro $ +# $Id: PKGBUILD 71722 2012-06-01 18:48:00Z ebelanger $ # Maintainer: Sven-Hendrik Haase # Contributor: Adrián Chaves Fernández, aka Gallaecio # Contributor: Shahar Weiss (build() code from his TORCS' PKGBUILD) pkgname=speed-dreams pkgver=2.0.0 _pkgver=2.0.0-r4687 -pkgrel=1 +pkgrel=2 pkgdesc="A racing simulator with rich graphics and physics" arch=('i686' 'x86_64') url="http://speed-dreams.sourceforge.net/" diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index 69238ea13..956361d38 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158669 2012-05-06 12:13:14Z allan $ +# $Id: PKGBUILD 160448 2012-06-02 03:17:38Z allan $ # Maintainer: Allan McRae # Contributor: Aaron Griffin pkgname=bash _basever=4.2 -_patchlevel=028 #prepare for some patches +_patchlevel=029 #prepare for some patches pkgver=$_basever.$_patchlevel pkgrel=1 pkgdesc="The GNU Bourne Again shell" @@ -134,4 +134,6 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' 'a6ed82daf034587aee2f2581ba5fe829' '821620a0389df723644911c56796ca8c' 'da9265aa2527fd4a7481baa3e0550287' - '0043f8b75f46f43608a67b863e300fe8') + '0043f8b75f46f43608a67b863e300fe8' + 'ec444d229e8899fbaaf6fc7de2d82ae6' + 'b632fca3a4943825bfaf3bd29df6b27d') diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD index 4161b1d43..8b3f37ea8 100644 --- a/core/btrfs-progs/PKGBUILD +++ b/core/btrfs-progs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156058 2012-04-12 15:42:01Z dreisner $ +# $Id: PKGBUILD 160394 2012-06-01 13:21:40Z dreisner $ # Maintainer: Tom Gundersen # Contributor: Tobias Powalowski pkgname=btrfs-progs pkgver=0.19.20120328 -pkgrel=2 +pkgrel=3 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64) depends=('glibc' 'e2fsprogs') @@ -16,7 +16,7 @@ source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz initcpio-install-btrfs initcpio-hook-btrfs) md5sums=('f4504e73cf9254779b78d5b2318ac570' - 'bdaaf6bd339220c63260acec809864d2' + '3eae9bf1541e297fa72aa40ebf7320c6' 'b09688a915a0ec8f40e2f5aacbabc9ad') build() { diff --git a/core/btrfs-progs/initcpio-install-btrfs b/core/btrfs-progs/initcpio-install-btrfs index dbeb47ee8..a70a324ed 100644 --- a/core/btrfs-progs/initcpio-install-btrfs +++ b/core/btrfs-progs/initcpio-install-btrfs @@ -1,9 +1,9 @@ #!/bin/bash build() { - MODULES=$(all_modules btrfs) - BINARIES=btrfs - SCRIPT=btrfs + add_all_modules btrfs + add_binary btrfs + add_runscript } help() { diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index fedc9ea92..aa12376ec 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 159428 2012-05-24 08:14:23Z thomas $ +# $Id: PKGBUILD 160396 2012-06-01 13:21:45Z dreisner $ # Maintainer: Thomas Bächler pkgname=cryptsetup pkgver=1.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -17,8 +17,8 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_install) sha256sums=('1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7' '4e6dbece8d1baad861479aca70d0cf30887420da9b5eab45d65d064c656893ed' - 'e4c00e2da274bf4cab3f72a0de779790a11a946d36b83144e74d3791e230b262' - 'cba1dc38ff6cc4d3740d0badfb2b151bb03d19e8e9fa497569ac2fb6f4196e0e') + 'e0cbcabb81233b4d465833dca0faf1e762dc3cb6611597a25fe24e5d7209f316' + 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae') build() { cd "${srcdir}"/$pkgname-${pkgver} diff --git a/core/cryptsetup/encrypt_hook b/core/cryptsetup/encrypt_hook index 0f35782c6..372b7ba57 100644 --- a/core/cryptsetup/encrypt_hook +++ b/core/cryptsetup/encrypt_hook @@ -10,20 +10,21 @@ run_hook() { IFS=: read ckdev ckarg1 ckarg2 </dev/null 2>&1 umount /ckey ;; *) # Read raw data from the block device # ckarg1 is numeric: ckarg1=offset, ckarg2=length - dd if="$ckdev" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1 + dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1 ;; esac fi @@ -58,13 +59,13 @@ EOF esac done - if poll_device "${cryptdev}" ${rootdelay}; then - if cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then + if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then + if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated dopassphrase=1 # If keyfile exists, try to use that if [ -f ${ckeyfile} ]; then - if eval cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; then + if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then dopassphrase=0 else echo "Invalid keyfile. Reverting to passphrase." @@ -76,7 +77,7 @@ EOF echo "A password is required to access the ${cryptname} volume:" #loop until we get a real password - while ! eval cryptsetup luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; do + while ! eval cryptsetup luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do sleep 2; done fi @@ -96,7 +97,7 @@ EOF err "Non-LUKS decryption not attempted..." return 1 fi - exe="cryptsetup create $cryptname $cryptdev $cryptargs" + exe="cryptsetup create $cryptname $resolved $cryptargs" IFS=: read c_hash c_cipher c_keysize c_offset c_skip < #Contributor: Urs Wolfer pkgname=dmraid pkgver=1.0.0.rc16.3 -pkgrel=4 +pkgrel=5 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/" conflicts=('mkinitcpio<0.7') @@ -17,7 +17,7 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 dmraid_hook) install=dmraid.install md5sums=('819338fcef98e8e25819f0516722beeb' - '832ed57a0f7ca6ba72adebcba2b17f87' + '2297d23cee1aef23ec6ad8d6d1870356' 'faec669dc85f87187b45b5d3968efe2c') build() { diff --git a/core/dmraid/dmraid_install b/core/dmraid/dmraid_install index c48e6ceaf..d3238c1f7 100644 --- a/core/dmraid/dmraid_install +++ b/core/dmraid/dmraid_install @@ -1,17 +1,20 @@ #!/bin/bash build() { - MODULES=" dm-mod dm-mirror " - BINARIES="dmraid dmsetup" - SCRIPT="dmraid" + add_module 'dm-mod' + add_module 'dm-mirror' + add_binary 'dmraid' + add_binary 'dmsetup' add_file "/usr/lib/udev/rules.d/10-dm.rules" add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" + + add_runscript } help() { - cat < # Contributor: Sergej Pupykin # Contributor: Andreas Wagner @@ -47,7 +47,7 @@ build() { MAILRC=/etc/mail.rc \ SENDMAIL=/usr/sbin/sendmail \ MAILSPOOL=/var/spool/mail \ - UCBINSTALL=/bin/install > makeflags + UCBINSTALL=/usr/bin/install > makeflags make `cat makeflags` IPv6=-DHAVE_IPv6_FUNCS } diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index e70165f98..9cbb8bcf3 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 158638 2012-05-05 04:07:30Z eric $ +# $Id: PKGBUILD 160347 2012-06-01 12:56:44Z dreisner $ # Maintainer: Eric Bélanger # Maintainer: Thomas Bächler pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.95 -pkgrel=4 +pkgrel=6 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') @@ -16,13 +16,19 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} 11-dm-initramfs.rules) sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85' '45f5e31045065e7bdf5d6f2e21c857b4978024b4' - '08007f13cf1a9caf6e4aca76dd2ed6a4ab037601' - '7d63aa838703c9f986531a78164b556f765f5cce' + '3e1680f9b76ce9150d08865d99db90fd15532271' + 'cedc9948123c870f9c5aa3357d0075b41a9c8135' 'f6a554eea9557c3c236df2943bb6e7e723945c41') build() { cd "${srcdir}/LVM2.${pkgver}" unset LDFLAGS + + # libudev.so.1.0.0 compat + sed -i 's,udev_get_dev_path([^)]\+),"/dev",' \ + tools/dmsetup.c \ + lib/misc/lvm-wrappers.c + ./configure --prefix=/ --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \ --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ diff --git a/core/lvm2/lvm2_hook b/core/lvm2/lvm2_hook index efb104998..e69b3349a 100644 --- a/core/lvm2/lvm2_hook +++ b/core/lvm2/lvm2_hook @@ -1,25 +1,24 @@ -# vim:set ft=sh: -run_hook () -{ - /sbin/modprobe -q dm-mod >/dev/null 2>&1 - if [ -e "/sys/class/misc/device-mapper" ]; then - if [ ! -e "/dev/mapper/control" ]; then - local major minor - IFS=: read major minor < /sys/class/misc/device-mapper/dev - mkdir /dev/mapper - mknod "/dev/mapper/control" c ${major} ${minor} - fi +#!/usr/bin/ash - # If the lvmwait= parameter has been specified on the command line - # wait for the device(s) before trying to activate the volume group(s) - for pvdev in ${lvmwait//,/ }; do - poll_device ${pvdev} ${rootdelay} - done +run_hook() { + local pvdev - [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" + modprobe -q dm-mod >/dev/null 2>&1 - msg "Activating logical volumes..." - [ -d /etc/lvm ] && /sbin/lvm vgscan - eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET + # If the lvmwait= parameter has been specified on the command line + # wait for the device(s) before trying to activate the volume group(s) + for pvdev in ${lvmwait//,/ }; do + poll_device ${pvdev} ${rootdelay} + done + + msg "Activating logical volumes..." + [ -d /etc/lvm ] && lvm vgscan + + if [ -n "$quiet" ]; then + lvm vgchange --sysinit -a y >/dev/null + else + lvm vgchange --sysinit -a y fi } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/lvm2/lvm2_install b/core/lvm2/lvm2_install index 98a995b14..145ce49b2 100644 --- a/core/lvm2/lvm2_install +++ b/core/lvm2/lvm2_install @@ -1,11 +1,10 @@ -# vim: set ft=sh: +#!/bin/bash -build() -{ - MODULES=" dm-mod dm-snapshot dm-mirror" - BINARIES="" - FILES="" - SCRIPT="lvm2" +build() { + local mod + for mod in dm-mod dm-snapshot dm-mirror; do + add_module "$mod" + done add_binary "/sbin/lvm" add_binary "/sbin/dmsetup" @@ -14,16 +13,19 @@ build() add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules" add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" + + add_runscript } -help () -{ -cat< pkgname=mkinitcpio-nfs-utils pkgver=0.3 -pkgrel=2 +pkgrel=3 pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio" arch=('i686' 'x86_64') url="http://www.archlinux.org/" license=('GPL2') depends=('glibc') -source=("ftp://ftp.archlinux.org/other/mkinitcpio/$pkgname-$pkgver.tar.xz") -sha256sums=('d290d489844fae100ca7b848b8eef40078124ff373203086bacc07329d1e8939') +source=("ftp://ftp.archlinux.org/other/mkinitcpio/$pkgname-$pkgver.tar.xz" + 'initcpio-install-net' + 'initcpio-hook-net') +sha256sums=('d290d489844fae100ca7b848b8eef40078124ff373203086bacc07329d1e8939' + '8e5ddaacb0e5751e432f95870958c5fa2e01e1ab3f55b5eca2b8b2d030b5d861' + '29a5a4a9ebd61bfa1afbb8dcaf2187e487ee1f34b1979a85a853fa2acbeb510e') build() { make -C "$pkgname-$pkgver" @@ -18,4 +22,8 @@ build() { package() { make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + + # override hooks, they need updates + install -m644 "$srcdir/initcpio-install-net" "$pkgdir/usr/lib/initcpio/install/net" + install -m644 "$srcdir/initcpio-hook-net" "$pkgdir/usr/lib/initcpio/hooks/net" } diff --git a/core/mkinitcpio-nfs-utils/initcpio-hook-net b/core/mkinitcpio-nfs-utils/initcpio-hook-net new file mode 100644 index 000000000..4d1ebb956 --- /dev/null +++ b/core/mkinitcpio-nfs-utils/initcpio-hook-net @@ -0,0 +1,90 @@ +# vim: set ft=sh: +run_hook() { + local line i net_mac bootif_mac bootif_dev defaultrootpath defaultserver + # These variables will be parsed from /tmp/net-*.conf generated by ipconfig + local DEVICE + local IPV4ADDR IPV4BROADCAST IPV4NETMASK IPV4GATEWAY IPV4DNS0 IPV4DNS1 + local HOSTNAME DNSDOMAIN NISDOMAIN ROOTSERVER ROOTPATH + local filename + # /tmp/net-*.conf + + if [ -z "${ip}" -a -n "${nfsaddrs}" ]; then + ip="${nfsaddrs}" + fi + + if [ -n "${ip}" ]; then + if [ -n "${BOOTIF}" ]; then + bootif_mac=${BOOTIF#01-} + bootif_mac=${bootif_mac//-/:} + for i in /sys/class/net/*/address; do + read net_mac < ${i} + if [ "${bootif_mac}" == "${net_mac}" ]; then + bootif_dev=${i#/sys/class/net/} + bootif_dev=${bootif_dev%/address} + break + fi + done + ip="${ip}::${bootif_dev}" + fi + + # setup network and save some values + ipconfig "ip=${ip}" + + for conf in /tmp/net-*.conf; do + [ -f "$conf" ] && . "$conf" + done + + # calculate nfs_server, nfs_path and nfs_option for later nfs mount + if [ "${root}" = "/dev/nfs" -o "${nfsroot}" != "" ]; then + # parse ROOTPATH if defined by dhcp server + if [ -n "${ROOTPATH}" ]; then + line="${ROOTPATH}" + nfs_server="${line%%:*}" + [ "${nfs_server}" = "${line}" ] && nfs_server="${ROOTSERVER}" + defaultserver="${nfs_server}" + line="${line#*:}" + nfs_path="${line}" + defaultrootpath="${nfs_path}" + else + # define a default ROOTPATH + if [ "${ROOTPATH}" = "" ]; then + defaultrootpath="/tftpboot/${IPV4ADDR}" + fi + fi + + # parse nfsroot if present (overrides ROOTPATH) + if [ -n "${nfsroot}" ]; then + line="${nfsroot}" + nfs_server="${line%%:*}" + [ -z "${nfs_server}" ] && nfs_server="${defaultserver}" + line="${line#*:}" + nfs_path="${line%%,*}" + line="${line#"${nfs_path}"}" + [ -z "${nfs_path}" ] && nfs_path="${defaultrootpath}" + nfs_option="${line#","}" + fi + + # ensure root and filesystem type are set proper for nfs boot + root="/dev/nfs" + rootfstype="nfs" + + echo "NFS-Mount: ${nfs_server}:${nfs_path}" + + # set mount handler for NFS + mount_handler="nfs_mount_handler" + fi + fi +} + +nfs_mount_handler() { + if [ -z "$nfs_server" -o -z "$nfs_path" ]; then + err "Unable to mount root filesystem over NFS: wrong parameters." + echo "You are being dropped to a recovery shell" + echo " Type 'exit' to try and continue booting" + launch_interactive_shell + msg "Trying to continue (this will most likely fail) ..." + fi + nfsmount ${nfs_option:+-o ${nfs_option}} "${nfs_server}:${nfs_path}" "$1" +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/mkinitcpio-nfs-utils/initcpio-install-net b/core/mkinitcpio-nfs-utils/initcpio-install-net new file mode 100644 index 000000000..7030e2d64 --- /dev/null +++ b/core/mkinitcpio-nfs-utils/initcpio-install-net @@ -0,0 +1,107 @@ +#!/bin/bash + +build() { + add_checked_modules '/drivers/net/' + + add_binary "/usr/lib/initcpio/ipconfig" "/bin/ipconfig" + add_binary "/usr/lib/initcpio/nfsmount" "/bin/nfsmount" + + add_runscript +} + +help() { + cat <:::::: +nfsaddrs= is an alias to ip= and can be used too. + + IP address of the client. If empty, the address will + either be determined by RARP/BOOTP/DHCP. What protocol + is used de- pends on the parameter. If this + parameter is not empty, autoconf will be used. + + IP address of the NFS server. If RARP is used to + determine the client address and this parameter is NOT + empty only replies from the specified server are + accepted. To use different RARP and NFS server, + specify your RARP server here (or leave it blank), and + specify your NFS server in the 'nfsroot' parameter + (see above). If this entry is blank the address of the + server is used which answered the RARP/BOOTP/DHCP + request. + + IP address of a gateway if the server is on a different + subnet. If this entry is empty no gateway is used and the + server is assumed to be on the local network, unless a + value has been received by BOOTP/DHCP. + + Netmask for local network interface. If this is empty, + the netmask is derived from the client IP address assuming + classful addressing, unless overridden in BOOTP/DHCP reply. + + Name of the client. If empty, the client IP address is + used in ASCII notation, or the value received by + BOOTP/DHCP. + + Name of network device to use. If this is empty, all + devices are used for RARP/BOOTP/DHCP requests, and the + first one we receive a reply on is configured. If you + have only one device, you can safely leave this blank. + + Method to use for autoconfiguration. If this is either + 'rarp', 'bootp', or 'dhcp' the specified protocol is + used. If the value is 'both', 'all' or empty, all + protocols are used. 'off', 'static' or 'none' means + no autoconfiguration. +Examples: +ip=127.0.0.1:::::lo:none --> Enable the loopback interface. +ip=192.168.1.1:::::eth2:none --> Enable static eth2 interface. +ip=:::::eth0:dhcp --> Enable dhcp protcol for eth0 configuration. + +nfsroot=[:][,] + +If the 'nfsroot' parameter is NOT given on the command line, the default +"/tftpboot/%s" will be used. + + Specifies the IP address of the NFS server. If this field + is not given, the default address as determined by the + 'ip' variable (see below) is used. One use of this + parameter is for example to allow using different servers + for RARP and NFS. Usually you can leave this blank. + + Name of the directory on the server to mount as root. If + there is a "%s" token in the string, the token will be + replaced by the ASCII-representation of the client's IP + address. + + Standard NFS options. All options are separated by commas. + If the options field is not given, the following defaults + will be used: + port = as given by server portmap daemon + rsize = 1024 + wsize = 1024 + timeo = 7 + retrans = 3 + acregmin = 3 + acregmax = 60 + acdirmin = 30 + acdirmax = 60 + flags = hard, nointr, noposix, cto, ac + +root=/dev/nfs + +If you don't use nfsroot= parameter you need to set root=/dev/nfs +to boot from a nfs root by autoconfiguration. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD index 5e45ba2e4..28af717d3 100644 --- a/core/procps-ng/PKGBUILD +++ b/core/procps-ng/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158584 2012-05-05 00:40:00Z eric $ +# $Id: PKGBUILD 160407 2012-06-01 18:48:22Z eric $ # Maintainer: Eric Bélanger pkgname=procps-ng -pkgver=3.3.2 -pkgrel=2 +pkgver=3.3.3 +pkgrel=1 pkgdesc="Utilities for monitoring your system and processes on your system" arch=('i686' 'x86_64') url="http://gitorious.org/procps" @@ -15,28 +15,15 @@ provides=('procps') replaces=('procps') backup=('etc/sysctl.conf') options=('!libtool') -source=(http://gitorious.org/procps/procps/archive-tarball/v${pkgver} sysctl.conf - sysctl_man.patch includes_restrict.patch gnu-kbsd-version.patch - complain_unmounted_proc.patch sig_printf_literal.patch - makefile_watch_ncurses.patch) -sha1sums=('889692f891e790ea035315ec321cce92d00a8db2' - 'ddf0dab2e3612d44903fc02f46316cabbec4651e' - '39d6562b83389ec4893de88ec88222f7169fa732' - 'd588825497fef0b057491377421fd8f68730d181' - '9eb2bb32a13656b5d671f9cffed3094399a26048' - 'bf57f5a1f54a0f4a6d9e99d66b8e447225c3371d' - '25be10b456d56b8bdf6260276c60738a7d76a34d' - '9fc24e48f902c19315e2557e4deea5592bbfad7e') +source=(procps-ng-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver} + sysctl.conf) +sha1sums=('e78a098f1a3c06722155800cc5cfa0c865af03c0' + 'ddf0dab2e3612d44903fc02f46316cabbec4651e') build() { cd "${srcdir}/procps-procps" + echo ${pkgver} > .tarball-version ./autogen.sh - patch -p1 < ../sysctl_man.patch - patch -p1 < ../includes_restrict.patch - patch -p1 < ../gnu-kbsd-version.patch - patch -p1 < ../complain_unmounted_proc.patch - patch -p1 < ../sig_printf_literal.patch - patch -p1 < ../makefile_watch_ncurses.patch ./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib make } diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index 5b99070d0..eaf765f3f 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159265 2012-05-20 05:50:51Z allan $ +# $Id: PKGBUILD 160450 2012-06-02 03:17:41Z allan $ # Maintainer: Allan McRae # Contributor: Tom Newsom pkgname=sudo -_ver=1.8.5p1 +_ver=1.8.5p2 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -15,8 +15,8 @@ backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool' '!makeflags') source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig} sudo.pam) -md5sums=('3b843e60e0bb226a24dd784345cbbba8' - '0f789f30462c2658afe9bd16602d76b1' +md5sums=('dc42ed9f0946d92273762d0ae7314d59' + '756d80fc1c996d4f5458deec5a69b5c4' '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') build() { diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 6760067ad..8d43830fd 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 155728 2012-04-06 00:04:01Z tomegun $ +# $Id: PKGBUILD 160349 2012-06-01 12:56:46Z dreisner $ # Maintainer: Tom Gundersen # Contributor: judd pkgname=util-linux -pkgver=2.21.1 -pkgrel=2 +pkgver=2.21.2 +pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') groups=('base') -depends=('udev') +depends=('udev' 'pam') conflicts=('util-linux-ng') provides=("util-linux-ng=${pkgver}") license=('GPL2') options=('!libtool') source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz) -optdepends=('perl: for chkdupexe support') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -29,7 +28,7 @@ build() { --enable-write \ --enable-raw \ --disable-wall \ - --enable-libmount-mount + --enable-new-mount make } @@ -47,7 +46,10 @@ package() { install -dm755 var/lib/hwclock + # broken tool, going away in next major release, so just remove it now + rm "${pkgdir}"/usr/{bin/chkdupexe,share/man/man1/chkdupexe.1} + # delete stray empty dir, fixed upstream rm -r usr/share/man/ru } -md5sums=('ad602dcd528f340b1329cfa6200d8f80') +md5sums=('54ba880f1d66782c2287ee2c898520e9') diff --git a/core/vi/PKGBUILD b/core/vi/PKGBUILD index edb6f7939..0a5c7f815 100644 --- a/core/vi/PKGBUILD +++ b/core/vi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142189 2011-11-06 02:27:51Z stephane $ +# $Id: PKGBUILD 160405 2012-06-01 18:35:53Z eric $ # Maintainer: tobias [ tobias at archlinux org ] pkgname=vi @@ -40,7 +40,7 @@ build() { package() { cd "${srcdir}/ex-${pkgver}" - make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex INSTALL=/bin/install \ + make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex INSTALL=/usr/bin/install \ DESTDIR="$pkgdir" install install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/extra/bluez/0001-udev-remove-deprecated-function.patch b/extra/bluez/0001-udev-remove-deprecated-function.patch new file mode 100644 index 000000000..7dadf5cd1 --- /dev/null +++ b/extra/bluez/0001-udev-remove-deprecated-function.patch @@ -0,0 +1,27 @@ +From 9e850650bd98e9d05fc937489692b26a64924d16 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen +Date: Sun, 27 May 2012 00:53:36 +0200 +Subject: [PATCH] udev: remove deprecated function + +This function has in the past returned "/sys" unconditionally. As of udev-183 it +is gone, so just replace it with the string. +--- + tools/hid2hci.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/hid2hci.c b/tools/hid2hci.c +index 45a3a3d..e3a5b2e 100644 +--- a/tools/hid2hci.c ++++ b/tools/hid2hci.c +@@ -291,7 +291,7 @@ int main(int argc, char *argv[]) + if (udev == NULL) + goto exit; + +- snprintf(syspath, sizeof(syspath), "%s/%s", udev_get_sys_path(udev), devpath); ++ snprintf(syspath, sizeof(syspath), "/sys/%s", devpath); + udev_dev = udev_device_new_from_syspath(udev, syspath); + if (udev_dev == NULL) { + fprintf(stderr, "error: could not find '%s'\n", devpath); +-- +1.7.10.2 + diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index e63cd2c66..d56ba44cd 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155739 2012-04-06 00:05:49Z tomegun $ +# $Id: PKGBUILD 160353 2012-06-01 12:58:12Z dreisner $ # Maintainer: Tom Gundersen # Contributor: Andrea Scarpino # Contributor: Geoffroy Carrier pkgname=bluez pkgver=4.99 -pkgrel=2 +pkgrel=6 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -25,6 +25,7 @@ options=('!libtool') backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" + '0001-udev-remove-deprecated-function.patch' 'bluetooth.conf.d' 'rc.bluetooth') @@ -47,7 +48,11 @@ build() { --enable-dund \ --enable-cups \ --enable-wiimote \ - --disable-test + --disable-test \ + --with-systemdunitdir=/usr/lib/systemd/system + + patch -p1 -i ../0001-udev-remove-deprecated-function.patch + make } @@ -76,9 +81,10 @@ package() { "${pkgdir}"/usr/bin/bluez-test-device \ "${pkgdir}"/usr/bin/bluez-test-input - # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html + # fixed upstream in git rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules } md5sums=('2387053eb5a7b02f37df4871df022a02' + '3175155fbaf73f01377f6c35b5c5e468' '7412982b440f29fa7f76a41a87fef985' '8f9498707f809506928b2e480d3b6789') diff --git a/extra/clutter-gtk2/PKGBUILD b/extra/clutter-gtk2/PKGBUILD index 5a3fb66b0..47ec45855 100644 --- a/extra/clutter-gtk2/PKGBUILD +++ b/extra/clutter-gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 147074 2012-01-21 15:12:46Z ibiru $ +# $Id: PKGBUILD 160400 2012-06-01 15:37:09Z ibiru $ # Maintainer: Jan "heftig" Steffens pkgname=clutter-gtk2 _pkgbasename=clutter-gtk pkgver=0.10.8 -pkgrel=2 +pkgrel=3 pkgdesc="GTK clutter widget" arch=('i686' 'x86_64') url="http://clutter-project.org/" @@ -24,6 +24,7 @@ build() { patch -Np1 -i "$srcdir/gir.patch" patch -Np1 -i "$srcdir/libm.patch" autoreconf -i + export CFLAGS+=" -lgthread-2.0" ./configure --prefix=/usr make } diff --git a/extra/consolekit/PKGBUILD b/extra/consolekit/PKGBUILD index c03db85c1..37a8a14c4 100644 --- a/extra/consolekit/PKGBUILD +++ b/extra/consolekit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158560 2012-05-04 23:57:00Z allan $ +# $Id: PKGBUILD 160357 2012-06-01 12:58:20Z dreisner $ # Maintainer: Jan de Groot # Contributor: onestep_ua pkgname=consolekit pkgver=0.4.6 -pkgrel=3 +pkgrel=4 pkgdesc="A framework for defining and tracking users, login sessions, and seats" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/ConsoleKit" @@ -16,6 +16,10 @@ options=(!libtool) # this has not been released yet, so this is a snapshot source=(ftp://ftp.archlinux.org/other/${pkgname}/ConsoleKit-${pkgver}.tar.bz2 pam-foreground-compat.ck consolekit.logrotate consolekit.tmpfiles.conf) +md5sums=('810990b607e338f06a6396c92b8a4a06' + 'a8a4de71d9b0549b8143e5f6c2a36fc7' + '6fefa451d9fe2fc6d6269629d3529793' + '8c5a8059db515d40fae1379daf084094') build() { cd "$srcdir/ConsoleKit-$pkgver" @@ -43,7 +47,3 @@ package() { rm -rf "${pkgdir}/var/run" } -md5sums=('810990b607e338f06a6396c92b8a4a06' - 'a8a4de71d9b0549b8143e5f6c2a36fc7' - '6fefa451d9fe2fc6d6269629d3529793' - '8c5a8059db515d40fae1379daf084094') diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 557724347..fd272e9f4 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 159195 2012-05-17 15:22:23Z ibiru $ +# $Id: PKGBUILD 160359 2012-06-01 12:58:23Z dreisner $ # Maintainer: Jan de Groot pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') pkgver=1.12.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL') makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2') diff --git a/extra/libatasmart/PKGBUILD b/extra/libatasmart/PKGBUILD index 7a1ec6b47..36c54c9e8 100644 --- a/extra/libatasmart/PKGBUILD +++ b/extra/libatasmart/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 141499 2011-10-31 03:19:13Z andrea $ +# $Id: PKGBUILD 160363 2012-06-01 12:58:30Z dreisner $ # Maintainer: Jan de Groot pkgname=libatasmart pkgver=0.18 -pkgrel=1 +pkgrel=2 pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library" arch=('i686' 'x86_64') license=('LGPL') -depends=('udev>=174') +depends=('udev') url="http://0pointer.de/blog/projects/being-smart.html" options=('!libtool') source=("http://0pointer.de/public/${pkgname}-${pkgver}.tar.gz") diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD index bde46da57..f4f54557c 100644 --- a/extra/libcanberra/PKGBUILD +++ b/extra/libcanberra/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158131 2012-05-03 13:15:53Z heftig $ +# $Id: PKGBUILD 160365 2012-06-01 12:58:34Z dreisner $ # Maintainer: Jan de Groot pkgbase=libcanberra pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) pkgver=0.28 -pkgrel=4 +pkgrel=5 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" arch=(i686 x86_64) license=('LGPL') @@ -35,7 +35,7 @@ package_libcanberra() { make -j1 DESTDIR="${pkgdir}" install rm -f "${pkgdir}"/usr/lib/libcanberra-gtk*.la rm -f "${pkgdir}"/usr/lib/gtk-{2,3}.0/modules/*.la - + install -d "${pkgdir}/usr/share/gconf" mv "${pkgdir}/etc/gconf/schemas" "${pkgdir}/usr/share/gconf/" diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 0b77550ce..ada897178 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159247 2012-05-19 08:19:03Z andyrtr $ +# $Id: PKGBUILD 160367 2012-06-01 12:58:38Z dreisner $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke @@ -15,13 +15,14 @@ if [ "${_git}" = "true" ]; then else pkgver=8.0.3 fi -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' - 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev') + 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183') url="http://mesa3d.sourceforge.net" license=('custom') -source=(LICENSE) +source=(LICENSE + mesa-8.0.3-llvm-3.1-fixes.patch) if [ "${_git}" = "true" ]; then # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') @@ -33,11 +34,14 @@ if [ "${_git}" = "true" ]; then ) fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' + 'c452ed3392468170726c004c2f4e02ca' 'cc5ee15e306b8c15da6a478923797171') build() { cd ${srcdir}/?esa-* + patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch" + if [ "${_git}" = "true" ]; then autoreconf -vfi ./autogen.sh --prefix=/usr \ diff --git a/extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch new file mode 100644 index 000000000..a567b5926 --- /dev/null +++ b/extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch @@ -0,0 +1,46 @@ +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +index a50a51d..f1bb4d9 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +@@ -235,7 +235,24 @@ lp_disassemble(const void* func) + int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); + #endif + +-#if HAVE_LLVM >= 0x0300 ++#if HAVE_LLVM >= 0x0301 ++ OwningPtr MRI(T->createMCRegInfo(Triple)); ++ if (!MRI) { ++ debug_printf("error: no register info for target %s\n", Triple.c_str()); ++ return; ++ } ++ ++ OwningPtr MII(T->createMCInstrInfo()); ++ if (!MII) { ++ debug_printf("error: no instruction info for target %s\n", Triple.c_str()); ++ return; ++ } ++#endif ++ ++#if HAVE_LLVM >= 0x0301 ++ OwningPtr Printer( ++ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); ++#elif HAVE_LLVM == 0x0300 + OwningPtr Printer( + T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); + #elif HAVE_LLVM >= 0x0208 +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index fe7616b..68f8808 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -62,7 +62,11 @@ + extern "C" void + lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE) + { ++#if HAVE_LLVM >= 0x0301 ++ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener()); ++#else + llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener()); ++#endif + } + + diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index c5f6e4b38..de9352da5 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155966 2012-04-10 09:35:44Z bisson $ +# $Id: PKGBUILD 160342 2012-06-01 11:41:45Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Angel Velasquez # Contributor: Andrea Scarpino @@ -7,7 +7,7 @@ pkgname=mpd pkgver=0.16.8 -pkgrel=2 +pkgrel=3 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki' license=('GPL') @@ -17,10 +17,13 @@ depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'f 'libpulse') makedepends=('doxygen') source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" + 'tmpfiles.d' 'rc.d') sha1sums=('977c80db8dc64e65c2bc523f69a9a7a71adca2b1' - '3777bdb4fff4b7911be3b1242aabae9d2912ef18') + 'f4d5922abb69abb739542d8e93f4dfd748acdad7' + '3470d489565f0ed479f1665dd2876f66acb5a585') +backup=('etc/mpd.conf') install=install build() { @@ -57,5 +60,6 @@ package() { install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists - install -Dm644 doc/mpdconf.example "${pkgdir}"/usr/share/mpd/mpd.conf.example + install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf + install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf } diff --git a/extra/mpd/install b/extra/mpd/install index 655645716..261b8fd0d 100644 --- a/extra/mpd/install +++ b/extra/mpd/install @@ -1,10 +1,11 @@ post_install() { getent group mpd &>/dev/null || groupadd -r -g 45 mpd >/dev/null - getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/true -G audio mpd >/dev/null - echo '==> Now create a /etc/mpd.conf file; see: /usr/share/mpd/mpd.conf.example' + getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/false -G audio mpd >/dev/null + true } post_remove() { getent passwd mpd &>/dev/null && userdel mpd >/dev/null getent group mpd &>/dev/null && groupdel mpd >/dev/null + true } diff --git a/extra/mpd/rc.d b/extra/mpd/rc.d index 86f77419f..f00e16067 100755 --- a/extra/mpd/rc.d +++ b/extra/mpd/rc.d @@ -3,8 +3,6 @@ . /etc/rc.conf . /etc/rc.d/functions -[[ -d /run/mpd ]] || install -d -g mpd -o mpd /run/mpd - case "$1" in start) stat_busy 'Starting Music Player Daemon' diff --git a/extra/mpd/tmpfiles.d b/extra/mpd/tmpfiles.d new file mode 100644 index 000000000..41c4e743a --- /dev/null +++ b/extra/mpd/tmpfiles.d @@ -0,0 +1 @@ +d /run/mpd 0755 mpd mpd diff --git a/extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch b/extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch new file mode 100644 index 000000000..93167b79b --- /dev/null +++ b/extra/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch @@ -0,0 +1,80 @@ +From 45607b113a052e4bec93a8707dc4db113c5dd100 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Sat, 26 May 2012 02:58:11 +0200 +Subject: [PATCH] Remove usage of deprecated udev_get_*_path + +These symbols were removed in libudev.so.1.0.0. Replace them with +hardcoded strings. + +Signed-off-by: Jan Alexander Steffens (heftig) +--- + src/modules/module-udev-detect.c | 9 +++------ + src/modules/udev-util.c | 4 ++-- + 2 files changed, 5 insertions(+), 8 deletions(-) + +diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c +index 1192194..31416bd 100644 +--- a/src/modules/module-udev-detect.c ++++ b/src/modules/module-udev-detect.c +@@ -123,7 +123,7 @@ static char *card_get_sysattr(const char *card_idx, const char *name) { + goto finish; + } + +- t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx); ++ t = pa_sprintf_malloc("/sys/class/sound/card%s", card_idx); + card = udev_device_new_from_syspath(udev, t); + pa_xfree(t); + +@@ -282,7 +282,7 @@ static void verify_access(struct userdata *u, struct device *d) { + pa_assert(u); + pa_assert(d); + +- cd = pa_sprintf_malloc("%s/snd/controlC%s", udev_get_dev_path(u->udev), path_get_card_id(d->path)); ++ cd = pa_sprintf_malloc("/dev/snd/controlC%s", path_get_card_id(d->path)); + accessible = access(cd, R_OK|W_OK) >= 0; + pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible)); + +@@ -621,7 +621,6 @@ fail: + } + + static int setup_inotify(struct userdata *u) { +- char *dev_snd; + int r; + + if (u->inotify_fd >= 0) +@@ -632,9 +631,7 @@ static int setup_inotify(struct userdata *u) { + return -1; + } + +- dev_snd = pa_sprintf_malloc("%s/snd", udev_get_dev_path(u->udev)); +- r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); +- pa_xfree(dev_snd); ++ r = inotify_add_watch(u->inotify_fd, "/dev/snd", IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); + + if (r < 0) { + int saved_errno = errno; +diff --git a/src/modules/udev-util.c b/src/modules/udev-util.c +index 2f18bc4..b0bb17d 100644 +--- a/src/modules/udev-util.c ++++ b/src/modules/udev-util.c +@@ -180,7 +180,7 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) { + goto finish; + } + +- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); ++ t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); + card = udev_device_new_from_syspath(udev, t); + pa_xfree(t); + +@@ -277,7 +277,7 @@ char* pa_udev_get_property(int card_idx, const char *name) { + goto finish; + } + +- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); ++ t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); + card = udev_device_new_from_syspath(udev, t); + pa_xfree(t); + +-- +1.7.10.2 + diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 41bf3fad1..cca5f2472 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 158827 2012-05-11 21:11:56Z heftig $ +# $Id: PKGBUILD 160369 2012-06-01 12:58:42Z dreisner $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Daniel J Griffiths # Contributor: Corrado Primier @@ -8,7 +8,7 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" pkgver=2.0 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) url="http://www.freedesktop.org/wiki/Software/PulseAudio" license=(GPL LGPL) @@ -18,13 +18,17 @@ makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit libsystemd) options=(!emptydirs !libtool) source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz - pulseaudio.xinit) + pulseaudio.xinit 0001-Remove-usage-of-deprecated-udev_get_-_path.patch) sha256sums=('28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061' - 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') + 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf' + '13e3cbe5499e462e8d818aa1faa2419aa880888ec18b4757cabbd7f5fcd6e803') build() { cd $pkgbase-$pkgver + # libudev.so.1.0.0 + patch -Np1 -i ../0001-Remove-usage-of-deprecated-udev_get_-_path.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ diff --git a/extra/pulseaudio/pulseaudio.install b/extra/pulseaudio/pulseaudio.install index fd7db3b36..1dc4cefb3 100755 --- a/extra/pulseaudio/pulseaudio.install +++ b/extra/pulseaudio/pulseaudio.install @@ -8,16 +8,12 @@ MES } post_upgrade() { - # Delete old users and groups - # System-wide daemon not supported anymore - if (( $(vercmp $2 0.9.22) < 0 )); then - getent passwd pulse &>/dev/null && usr/sbin/userdel -f pulse - getent group pulse-access &>/dev/null && usr/sbin/groupdel pulse-access - getent group pulse-rt &>/dev/null && usr/sbin/groupdel pulse-rt - getent group pulse &>/dev/null && usr/sbin/groupdel pulse - fi - - true + cat << MES +>>> If you have per-user copies of configuration files (such as client.conf, + daemon.conf or default.pa) in ~/.pulse/, make sure you keep them in sync + with changes to the packaged files in /etc/pulse/. Otherwise, PulseAudio + may refuse to start due to configuration errors. +MES } # vim:set ts=2 sw=2 et: diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 290f217e2..6882fd26a 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159123 2012-05-16 10:08:44Z tpowa $ +# $Id: PKGBUILD 160385 2012-06-01 13:01:31Z tpowa $ # Maintainer: Gaetan Bisson # Contributor: Thayer Williams # Contributor: Alexander Fehr @@ -6,7 +6,7 @@ pkgname=slim pkgver=1.3.3 -pkgrel=3 +pkgrel=4 pkgdesc='Desktop-independent graphical login manager for X11' arch=('i686' 'x86_64') url='http://slim.berlios.de/' @@ -23,7 +23,6 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'session-name.patch' 'fix-numlock-1.3.3.patch') - install=install build() { @@ -60,7 +59,7 @@ md5sums=('ce53e44c1e4a2eacf5bb7688ee2a5de8' 'd8ea9c4dee2811524b67f4f666311a1f' 'ebfff3417058619a1328284ae0e2f48e' '43da096480bf72c3ccec8ad8400f34f0' - 'aef560f5a765582b2a7fc1fac5b323a7' + '7c0bf1fb6292537e2c63ec04f8532079' 'ae4b237d472ec5d373e30080aa0ff804' 'ebcb6829028615686de7b64ceeaaf8ed' '6c29c93370e44ed310ff30132424b619') diff --git a/extra/slim/slim.service b/extra/slim/slim.service index 26093a8bf..18d8c99be 100644 --- a/extra/slim/slim.service +++ b/extra/slim/slim.service @@ -1,7 +1,6 @@ [Unit] Description=SLiM Simple Login Manager -Requires=dev-tty7.device -After=dev-tty7.device systemd-user-sessions.service +After=systemd-user-sessions.service [Service] ExecStart=/usr/bin/slim -nodaemon diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index a34978cfa..4393e612a 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 155747 2012-04-06 00:06:00Z tomegun $ +# $Id: PKGBUILD 160371 2012-06-01 12:58:45Z dreisner $ # Maintainer: Andrea Scarpino pkgbase=system-config-printer pkgname=('system-config-printer-common' 'system-config-printer-gnome') pkgver=1.3.9 -pkgrel=2 +pkgrel=3 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64') license=('GPL') -makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils') +makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl' + 'libusb-compat' 'desktop-file-utils') source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig}) md5sums=('df424f127eede63965608e5ec5e27519' 'd105b7f7725c1ec538b6e6adb10667f3') @@ -21,7 +22,10 @@ build() { sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') - sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer + sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer + + # Fix build with udev 183 + sed -i 's:udev_get_sys_path (udev):"/sys":' udev/udev-configure-printer.c ./configure --prefix=/usr \ --sbindir=/usr/bin \ diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD index 74eef1d57..e576d2e89 100644 --- a/extra/udisks/PKGBUILD +++ b/extra/udisks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155737 2012-04-06 00:05:45Z tomegun $ +# $Id: PKGBUILD 160373 2012-06-01 12:58:48Z dreisner $ # Maintainer: Jan de Groot pkgname=udisks pkgver=1.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="Disk Management Service" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -18,15 +18,13 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/udisks --disable-static - #fix location for bash_completion helper - sed -i -e 's|profile.d|bash_completion.d|' tools/Makefile - make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install + chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh" # move udev helpers and rules to /usr/lib mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/ rm -r "${pkgdir}"/lib diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index b94cfda1d..7c1e9bf6b 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 153753 2012-03-19 15:14:49Z giovanni $ +# $Id: PKGBUILD 160375 2012-06-01 12:58:51Z dreisner $ # Maintainer: Giovanni Scafora # Contributor: Sarah Hay # Contributor: Martin Sandsmark pkgname=vlc pkgver=2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD index a6d670028..5735fc350 100644 --- a/extra/xf86-video-ati/PKGBUILD +++ b/extra/xf86-video-ati/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 159235 2012-05-18 15:27:54Z andyrtr $ +# $Id: PKGBUILD 160377 2012-06-01 12:58:56Z dreisner $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=xf86-video-ati pkgver=6.14.99 _gitdate=20120517 -pkgrel=0.${_gitdate} +pkgrel=1.${_gitdate} # UMS/EXA: Add reminder for potential solid picture performance issue. pkgdesc="X.org ati video driver" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') -depends=('libpciaccess' 'libdrm>=2.4.33' 'udev' 'pixman' 'ati-dri') +depends=('libpciaccess' 'libdrm>=2.4.33' 'udev>=183' 'pixman' 'ati-dri') makedepends=('xorg-server-devel>=1.11.99.902' 'xf86driproto' 'mesa' 'glproto') conflicts=('xorg-server<1.11.99.902') groups=('xorg-drivers' 'xorg') diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index b0459b075..90404585d 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 158952 2012-05-13 15:44:53Z andyrtr $ +# $Id: PKGBUILD 160379 2012-06-01 12:59:00Z dreisner $ # Maintainer: Jan de Groot pkgname=xf86-video-intel pkgver=2.19.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') -depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.8' 'libxfixes' 'udev') +depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.8' 'libxfixes' 'udev>=183') makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') conflicts=('xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy') options=('!libtool') diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD index 8e2dffd5d..a9fc10cbd 100644 --- a/extra/xf86-video-nouveau/PKGBUILD +++ b/extra/xf86-video-nouveau/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 158956 2012-05-13 15:53:05Z ibiru $ +# $Id: PKGBUILD 160381 2012-06-01 12:59:04Z dreisner $ # Maintainer: Andreas Radke # Contributor: buddabrod pkgname=xf86-video-nouveau _gitdate=20120512 pkgver=0.0.16_git${_gitdate} # see configure.ac -pkgrel=1 -pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)" +pkgrel=2 +pkgdesc="Open Source 2D acceleration driver for nVidia cards (experimental)" arch=('i686' 'x86_64') url="http://nouveau.freedesktop.org/wiki/" license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 47873d47f..0219bde16 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159267 2012-05-20 08:22:19Z andyrtr $ +# $Id: PKGBUILD 160383 2012-06-01 12:59:08Z dreisner $ # Maintainer: Jan de Groot pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.12.1.902 +pkgver=1.12.2 pkgrel=1 arch=('i686' 'x86_64') license=('custom') @@ -11,7 +11,7 @@ url="http://xorg.freedesktop.org" makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' - 'xorg-font-util' 'glproto' 'dri2proto' 'udev' 'libgcrypt') + 'xorg-font-util' 'glproto' 'dri2proto' 'udev>=183' 'libgcrypt') options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch @@ -21,7 +21,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 10-quirks.conf) -sha256sums=('052efb01c47348b4138c89ad5654be022a4d952acc6129b2ad2659bc1ff4d509' +sha256sums=('ca9f9e22f432f1ccbf8e7a21e746e02be4081a0f3975eb7cff276483193cc5f5' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' diff --git a/kde-unstable/kdeadmin/PKGBUILD b/kde-unstable/kdeadmin/PKGBUILD index a9813985e..3e4db1861 100644 --- a/kde-unstable/kdeadmin/PKGBUILD +++ b/kde-unstable/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160110 2012-05-29 22:35:44Z andrea $ +# $Id: PKGBUILD 160427 2012-06-01 21:34:11Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -8,7 +8,7 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') pkgver=4.8.80 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -16,7 +16,7 @@ groups=('kde' 'kdeadmin') makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('3c9016b7ec0e174c9744dd340d237086d90aa345' +sha1sums=('2196c02501eb1b1bb773909f9760665aa17f889d' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { diff --git a/kde-unstable/kdebase-konsole/PKGBUILD b/kde-unstable/kdebase-konsole/PKGBUILD index 5493f2076..634e5b2a6 100644 --- a/kde-unstable/kdebase-konsole/PKGBUILD +++ b/kde-unstable/kdebase-konsole/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160112 2012-05-29 22:41:16Z andrea $ +# $Id: PKGBUILD 160428 2012-06-01 21:34:47Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebase-konsole pkgver=4.8.80 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://kde.org/applications/system/konsole/' pkgdesc="Terminal" @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime' 'kdebase-lib') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/unstable/${pkgver}/src/konsole-${pkgver}.tar.xz") -sha1sums=('e7c471637fd052261521716882f0d543161692c4') +sha1sums=('4acd23dab275143cd8c182ca3460d259ae472b43') build() { cd "${srcdir}" diff --git a/kde-unstable/kdebase-workspace/PKGBUILD b/kde-unstable/kdebase-workspace/PKGBUILD index 9b138a0a1..b67eb765b 100644 --- a/kde-unstable/kdebase-workspace/PKGBUILD +++ b/kde-unstable/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160094 2012-05-29 22:27:42Z andrea $ +# $Id: PKGBUILD 160331 2012-06-01 08:53:07Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -30,7 +30,7 @@ options=('emptydirs') source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('4d07acfeddf522d6354bb4ee9330cdf0be8d06de' +sha1sums=('e65c561aaa60b0e3dd25cc93f389f119e1d65832' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' '712a90999bd429883dcef5dcaf288aace332ced8' 'b321b5e613b60231330e606fdf1e124646148388' diff --git a/kde-unstable/kdebase/PKGBUILD b/kde-unstable/kdebase/PKGBUILD index 5a2078269..8c2cd7196 100644 --- a/kde-unstable/kdebase/PKGBUILD +++ b/kde-unstable/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160096 2012-05-29 22:29:11Z andrea $ +# $Id: PKGBUILD 160423 2012-06-01 21:31:27Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -13,14 +13,14 @@ pkgname=('kdebase-dolphin' 'kdebase-lib' 'kdebase-plasma') pkgver=4.8.80 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/unstable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") -sha1sums=('7057f83087295391c2bbbd1d75a79cf1ec696a20') +sha1sums=('10cada2c0ea7f1d71169d779ddbea2a30f968e2a') build() { cd ${srcdir} diff --git a/kde-unstable/kdeedu-kalgebra/PKGBUILD b/kde-unstable/kdeedu-kalgebra/PKGBUILD index dca3c6bee..917d58df3 100644 --- a/kde-unstable/kdeedu-kalgebra/PKGBUILD +++ b/kde-unstable/kdeedu-kalgebra/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160117 2012-05-29 22:43:25Z andrea $ +# $Id: PKGBUILD 160429 2012-06-01 21:35:17Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kalgebra pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kalgebra-${pkgver}.tar.xz") -sha1sums=('890a56c4f302019015fc3f85ef044a638f35d01e') +sha1sums=('fd68687a4923c60c805cf3740b921f051788d848') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-kalzium/PKGBUILD b/kde-unstable/kdeedu-kalzium/PKGBUILD index cc4855602..12d3d773d 100644 --- a/kde-unstable/kdeedu-kalzium/PKGBUILD +++ b/kde-unstable/kdeedu-kalzium/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160118 2012-05-29 22:43:50Z andrea $ +# $Id: PKGBUILD 160430 2012-06-01 21:35:47Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kalzium pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdelibs' 'avogadro' 'ocaml' 'facile') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kalzium-${pkgver}.tar.xz") -sha1sums=('94f69274e86ffa5159bcb2e670be1d5560068057') +sha1sums=('8d177117eb9b92282c7c47c4d7bfd2fda641d182') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-ktouch/PKGBUILD b/kde-unstable/kdeedu-ktouch/PKGBUILD index 222ea6d74..bd0f24f81 100644 --- a/kde-unstable/kdeedu-ktouch/PKGBUILD +++ b/kde-unstable/kdeedu-ktouch/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160128 2012-05-29 22:49:33Z andrea $ +# $Id: PKGBUILD 160431 2012-06-01 21:36:26Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-ktouch pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/ktouch-${pkgver}.tar.xz") -sha1sums=('5d046796b78e506ef451c70a2ee68b8b337dc4de') +sha1sums=('9cb0caaadc9b80eb452cebe31a7a58b8cdadc037') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-marble/PKGBUILD b/kde-unstable/kdeedu-marble/PKGBUILD index 95184c315..6f14a76e3 100644 --- a/kde-unstable/kdeedu-marble/PKGBUILD +++ b/kde-unstable/kdeedu-marble/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160098 2012-05-29 22:30:07Z andrea $ +# $Id: PKGBUILD 160425 2012-06-01 21:32:33Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-marble pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('d3f6b27cda2710d48dfa2873dc09f4b0bccbcb09') +sha1sums=('9cf35d867f1336c5d42bbb3fa90a8310742d5008') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-pairs/PKGBUILD b/kde-unstable/kdeedu-pairs/PKGBUILD index 8cf2bee76..a62df2b78 100644 --- a/kde-unstable/kdeedu-pairs/PKGBUILD +++ b/kde-unstable/kdeedu-pairs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160131 2012-05-29 22:50:49Z andrea $ +# $Id: PKGBUILD 160432 2012-06-01 21:37:01Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-pairs pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="A memory and pairs game for KDE" url="https://projects.kde.org/projects/kde/kdeedu/pairs" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/pairs-${pkgver}.tar.xz") -sha1sums=('349954ee22080f49025d997047d2b2ce88f00c9c') +sha1sums=('5e7576227c881c8620495c82673d334f18e6e157') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-rocs/PKGBUILD b/kde-unstable/kdeedu-rocs/PKGBUILD index 70aba2913..16c348b29 100644 --- a/kde-unstable/kdeedu-rocs/PKGBUILD +++ b/kde-unstable/kdeedu-rocs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160133 2012-05-29 22:51:56Z andrea $ +# $Id: PKGBUILD 160433 2012-06-01 21:37:42Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-rocs pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/unstable/${pkgver}/src/rocs-${pkgver}.tar.xz") -sha1sums=('58722f1cd841e417ac0b3a3074b03e509f34e8e2') +sha1sums=('4c0a872c547f16e59f46992b8549cd098e8234e0') options=('!makeflags') build() { diff --git a/kde-unstable/kdegames/PKGBUILD b/kde-unstable/kdegames/PKGBUILD index e3a82756c..2fa126bc4 100644 --- a/kde-unstable/kdegames/PKGBUILD +++ b/kde-unstable/kdegames/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160135 2012-05-29 22:53:39Z andrea $ +# $Id: PKGBUILD 160434 2012-06-01 21:39:11Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -44,7 +44,7 @@ pkgname=('kdegames-bomber' 'kdegames-lskat' 'kdegames-palapeli') pkgver=4.8.80 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -52,7 +52,7 @@ groups=('kde' 'kdegames') makedepends=('cmake' 'automoc4' 'twisted' 'kdebindings-python2' 'openal') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('7bdb73030e4db5431f7a6babcd8b06f49185680f') +sha1sums=('94378986a7f6196ecd2c176fad1804c8c00f2822') build() { cd $srcdir diff --git a/kde-unstable/kdegraphics-gwenview/PKGBUILD b/kde-unstable/kdegraphics-gwenview/PKGBUILD index 023c7183e..597ca7b92 100644 --- a/kde-unstable/kdegraphics-gwenview/PKGBUILD +++ b/kde-unstable/kdegraphics-gwenview/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160136 2012-05-29 22:55:47Z andrea $ +# $Id: PKGBUILD 160435 2012-06-01 21:41:28Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-gwenview pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/unstable/${pkgver}/src/gwenview-${pkgver}.tar.xz") -sha1sums=('aaebf6f6772cda045b8f322e4bd2fabb8253e3e7') +sha1sums=('1eb9e84a209dcd03790436a7ab3613e5998ea373') build() { cd "${srcdir}" diff --git a/kde-unstable/kdegraphics-mobipocket/PKGBUILD b/kde-unstable/kdegraphics-mobipocket/PKGBUILD index 0efa8ae2a..e34f10678 100644 --- a/kde-unstable/kdegraphics-mobipocket/PKGBUILD +++ b/kde-unstable/kdegraphics-mobipocket/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160144 2012-05-29 22:59:17Z andrea $ +# $Id: PKGBUILD 160436 2012-06-01 21:42:03Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdegraphics-mobipocket pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="A collection of plugins to handle mobipocket files" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('38772a3e115d27945727c2d5d0c6b0e5ba055ac0') +sha1sums=('8d8b8a090190b8545cff1f34f9fe28e73b5acfe0') build() { cd "${srcdir}" diff --git a/kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD b/kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD index de2684a8b..99f1ed8e9 100644 --- a/kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160152 2012-05-29 23:01:50Z andrea $ +# $Id: PKGBUILD 160437 2012-06-01 21:42:34Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-ffmpegthumbs pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc='FFmpeg-based thumbnail creator for video files' url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs' arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdelibs' 'ffmpeg') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/unstable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz") -sha1sums=('092060cc8ab89612a5fd1955f2d9c39521c67daa') +sha1sums=('d72b42d887d40f2feda1e1200859b9723008de38') build() { cd "${srcdir}" diff --git a/kde-unstable/kdemultimedia-juk/PKGBUILD b/kde-unstable/kdemultimedia-juk/PKGBUILD index 78a75b39a..f7272d5d7 100644 --- a/kde-unstable/kdemultimedia-juk/PKGBUILD +++ b/kde-unstable/kdemultimedia-juk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160153 2012-05-29 23:02:12Z andrea $ +# $Id: PKGBUILD 160438 2012-06-01 21:43:03Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-juk pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc='A jukebox, tagger and music collection manager' url='http://kde.org/applications/multimedia/juk/' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('kdebase-runtime' 'taglib') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/unstable/${pkgver}/src/juk-${pkgver}.tar.xz") -sha1sums=('07cf74206540294e4a942482708182e4d2578b37') +sha1sums=('ab7049e8db9162926941b7502178342ddd1674fd') build() { cd "${srcdir}" diff --git a/kde-unstable/kdemultimedia-kmix/PKGBUILD b/kde-unstable/kdemultimedia-kmix/PKGBUILD index 88336c1c7..22a5d1db6 100644 --- a/kde-unstable/kdemultimedia-kmix/PKGBUILD +++ b/kde-unstable/kdemultimedia-kmix/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160154 2012-05-29 23:02:35Z andrea $ +# $Id: PKGBUILD 160439 2012-06-01 21:43:34Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdemultimedia-kmix pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="KDE volume control program" url='http://kde.org/applications/multimedia/kmix/' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/unstable/${pkgver}/src/kmix-${pkgver}.tar.xz") -sha1sums=('e6e7ffc05b800d17b8b32600410a6ecbce773f8c') +sha1sums=('1b3d07117178d3232d308babb4c42dfdebc58d2d') build() { cd "${srcdir}" diff --git a/kde-unstable/kdenetwork/PKGBUILD b/kde-unstable/kdenetwork/PKGBUILD index 53d94acb4..e8f24511f 100644 --- a/kde-unstable/kdenetwork/PKGBUILD +++ b/kde-unstable/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160157 2012-05-29 23:04:03Z andrea $ +# $Id: PKGBUILD 160440 2012-06-01 21:44:21Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -11,7 +11,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-krdc' 'kdenetwork-krfb') pkgver=4.8.80 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -21,7 +21,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('66a50bb88660c85fb6a94c3411b9387f8c885544') +sha1sums=('175ba73cfc873f282736ac9a2eb31863690c9670') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeplasma-addons/PKGBUILD b/kde-unstable/kdeplasma-addons/PKGBUILD index be384b5f3..4361bbd6f 100644 --- a/kde-unstable/kdeplasma-addons/PKGBUILD +++ b/kde-unstable/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160159 2012-05-29 23:06:08Z andrea $ +# $Id: PKGBUILD 160441 2012-06-01 21:45:19Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -75,7 +75,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') pkgver=4.8.80 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL') @@ -83,7 +83,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('f29306ffbae3fab7eb4f3bd0a0e9a3cb6be88036') +sha1sums=('138ed0e557d31c4254bd4cc90f4bab65885dc35e') build() { cd "${srcdir}" diff --git a/kde-unstable/kdesdk/PKGBUILD b/kde-unstable/kdesdk/PKGBUILD index 660a33a4d..18603f3dc 100644 --- a/kde-unstable/kdesdk/PKGBUILD +++ b/kde-unstable/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160160 2012-05-29 23:07:28Z andrea $ +# $Id: PKGBUILD 160442 2012-06-01 21:46:45Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -21,7 +21,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') pkgver=4.8.80 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -30,7 +30,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-python2-path.patch') -sha1sums=('1d8787a52aa8ef29ae80ca85683b7d0303277c38' +sha1sums=('f440db71079b2bd90ab402bc5d22fa4f222f2c82' '923cabd7a877cf9a68efeb24fbf3d5827e1d949e') build() { diff --git a/kde-unstable/libkcddb/PKGBUILD b/kde-unstable/libkcddb/PKGBUILD index 6a90c4c59..6cfd56f70 100644 --- a/kde-unstable/libkcddb/PKGBUILD +++ b/kde-unstable/libkcddb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160104 2012-05-29 22:33:14Z andrea $ +# $Id: PKGBUILD 160426 2012-06-01 21:33:36Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkcddb pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="KDE CDDB library" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('7741b061d9dcb0cb8edc73c140943ca52ce8e74e') +sha1sums=('5adbc38ae49d8e948c0ef55e2a2185e82872524d') build() { cd "${srcdir}" diff --git a/kde-unstable/libkdeedu/PKGBUILD b/kde-unstable/libkdeedu/PKGBUILD index f6114daec..c9153904a 100644 --- a/kde-unstable/libkdeedu/PKGBUILD +++ b/kde-unstable/libkdeedu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160097 2012-05-29 22:29:42Z andrea $ +# $Id: PKGBUILD 160424 2012-06-01 21:32:03Z andrea $ # Maintainer: Andrea Scarpino pkgname=libkdeedu pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="Libraries used by KDE Education applications" url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('d260aa9679ed0d9a7711b4e9311d4c8cb7e9c17d') +sha1sums=('ebdc42d9eacdeae49183f0393a2bf75ab86da15e') build() { cd "${srcdir}" diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 1953c1764..f5962063a 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -7,8 +7,8 @@ _pkgname=audacious-plugins pkgname=audacious-plugins-libre -pkgver=3.2.2 -pkgrel=1.1 +pkgver=3.2.3 +pkgrel=1 pkgdesc='Plugins for Audacious without unfree plugins' url='http://audacious-media-player.org/' arch=('i686' 'x86_64') @@ -60,7 +60,7 @@ optdepends=('oss: Open Sound System v4 output' 'libcue: CUE playlist format') source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('4518a6fdcba0c1b496e048b45ce5d87a46326c9b') +sha1sums=('87a795c4ecf645ad36ffe7bb3a7b5691e0316f71') build() { # Retrieve upstream & remove plugin 'psf' due to issues mentioned above. sed -i s/enable_psf=yes/enable_psf=no/ ${_pkgname}-$pkgver/configure diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD index f04ec2f47..223eaff72 100644 --- a/libre/xchat-libre/PKGBUILD +++ b/libre/xchat-libre/PKGBUILD @@ -1,10 +1,12 @@ -# Maintainer: Eric Belanger -# Maintainer: Henry Jensen +# $Id: PKGBUILD 159467 2012-05-24 17:52:29Z eric $ +# Maintainer: Eric Bélanger +# Maintainer (ConnochaetOS): Henry Jensen +# Maintainet (Parabola): André Silva -pkgbasename=xchat +_pkgname=xchat pkgname=xchat-libre pkgver=2.8.8 -pkgrel=7 +pkgrel=10 pkgdesc="A GTK+ based IRC client without non-free browser reference" arch=('i686' 'x86_64') url="http://www.xchat.org/" @@ -12,39 +14,50 @@ provides=("xchat=$pkgver") replaces=('xchat') conflicts=('xchat') license=('GPL') -depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify') -makedepends=('tcl' 'perl' 'python2') +depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify' 'hicolor-icon-theme') +makedepends=('tcl' 'perl' 'python2' 'librsvg') optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin' 'python2: for python plugin') options=('!libtool') -changelog=ChangeLog -source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgbasename}-${pkgver}.tar.xz +install=xchat.install +source=(http://www.xchat.org/files/source/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz + http://xchat.org/files/icons/xchat-svg.tar.bz2 xchat-2.8.8-libnotify07.patch xchat-2.8.8-link-against-libnotify.patch + xchat-2.8.8-glib-2.31.patch remove-non-free-suggestion.patch no-firefox.patch) +sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532' + '0d366346cc11e0efb57fc2648fe423c94a3469bd' + 'a053fba4e1911d1ee6a8248fe19e344797920fe3' + '70c3cc29fc55ff35f701ef8ac23078b6e3761ce1' + 'aecaf6176a7cfd62555207b02f2793b360aa39da' + 'ead8947ae0033735803a0353e3b9d23f40fff990' + 'aae58e189481e336825f8b56bf6939d55b2e42f3') build() { - cd "${srcdir}/${pkgbasename}-${pkgver}" - patch -Np1 -i ${srcdir}/remove-non-free-suggestion.patch - patch -Np1 -i ${srcdir}/no-firefox.patch - patch -Np1 -i ${srcdir}/xchat-2.8.8-libnotify07.patch - patch -Np1 -i ${srcdir}/xchat-2.8.8-link-against-libnotify.patch + cd "${srcdir}/${_pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch" + patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch" + patch -p1 -i "${srcdir}/xchat-2.8.8-glib-2.31.patch" + patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch" + patch -p1 -i "${srcdir}/no-firefox.patch" autoconf autoheader - ./configure --prefix=/usr --sysconfdir=/etc --enable-openssl --enable-dbus \ - --disable-textfe --enable-ipv6 --enable-shm --enable-spell=static + LIBS+="-lgmodule-2.0" ./configure --prefix=/usr --sysconfdir=/etc --datadir=/usr/share \ + --enable-openssl --enable-dbus --disable-textfe --enable-ipv6 --enable-shm --enable-spell=static make } package() { - cd "${srcdir}/${pkgbasename}-${pkgver}" + cd "${srcdir}/${_pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install -} -md5sums=('9a11f13121ff0af787bba3b014378e58' - '8f0ba48dc3d151cd9b4fbef3255e8c95' - '805893e0d8f7c9713d703f34b6bb4b89' - 'd0968310982fa9e30d43dd43536b7387' - 'ba11c3e889509d1b46307d6ebf74509c') + for i in 24 32 48 64 128 256 ; do + install -d "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps" + rsvg-convert -w $i -h $i -o "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/xchat.png" ../xchat-cloned.svg + done + install -D -m644 ../xchat-cloned.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xchat.svg" + install -D -m644 ../xchat-used.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/xchat2.svg" +} diff --git a/libre/xchat-libre/no-firefox.patch b/libre/xchat-libre/no-firefox.patch index 7fb5190de..f1ecd6631 100644 --- a/libre/xchat-libre/no-firefox.patch +++ b/libre/xchat-libre/no-firefox.patch @@ -5,7 +5,7 @@ /* everything failed, what now? just try firefox */ - if (try_browser ("firefox", NULL, url)) -+ if (try_browser ("icecat", NULL, url)) ++ if (try_browser ("iceweasel", NULL, url)) return; /* fresh out of ideas... */ diff --git a/libre/xchat-libre/remove-non-free-suggestion.patch b/libre/xchat-libre/remove-non-free-suggestion.patch index 943daff60..9383db521 100644 --- a/libre/xchat-libre/remove-non-free-suggestion.patch +++ b/libre/xchat-libre/remove-non-free-suggestion.patch @@ -6,7 +6,7 @@ diff -urN xchat-2.8.8.orig/src/common/xchat.c xchat-2.8.8/src/common/xchat.c static char defaultconf_urlhandlers[] = - "NAME Open Link in Opera\n" "CMD !opera -remote 'openURL(%s)'\n\n"; -+ "NAME Open Link in Web Browser\n" "CMD !icecat '%s'\n\n"; ++ "NAME Open Link in Web Browser\n" "CMD !iceweasel '%s'\n\n"; #ifdef USE_SIGACTION /* Close and open log files on SIGUSR1. Usefull for log rotating */ diff --git a/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch b/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch new file mode 100644 index 000000000..63f562ff8 --- /dev/null +++ b/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch @@ -0,0 +1,62 @@ +Author: Dominique Leuenberger + +http://sourceforge.net/tracker/?func=detail&aid=3446968&group_id=239&atid=100239 + +glib got stricter in checking includes. Only glib.h (and a few exceptions) +are to be included directly. + +Index: xchat-2.8.8/src/common/servlist.c +=================================================================== +--- xchat-2.8.8.orig/src/common/servlist.c ++++ xchat-2.8.8/src/common/servlist.c +@@ -24,7 +24,7 @@ + #include + + #include "xchat.h" +-#include ++#include + + #include "cfgfiles.h" + #include "fe.h" +Index: xchat-2.8.8/src/common/text.c +=================================================================== +--- xchat-2.8.8.orig/src/common/text.c ++++ xchat-2.8.8/src/common/text.c +@@ -28,7 +28,7 @@ + #include + + #include "xchat.h" +-#include ++#include + #include "cfgfiles.h" + #include "chanopt.h" + #include "plugin.h" +Index: xchat-2.8.8/src/common/util.c +=================================================================== +--- xchat-2.8.8.orig/src/common/util.c ++++ xchat-2.8.8/src/common/util.c +@@ -39,7 +39,7 @@ + #include + #include "xchat.h" + #include "xchatc.h" +-#include ++#include + #include + #include "util.h" + #include "../../config.h" +Index: xchat-2.8.8/src/common/xchat.h +=================================================================== +--- xchat-2.8.8.orig/src/common/xchat.h ++++ xchat-2.8.8/src/common/xchat.h +@@ -1,10 +1,6 @@ + #include "../../config.h" + +-#include +-#include +-#include +-#include +-#include ++#include + #include /* need time_t */ + + #ifndef XCHAT_H diff --git a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch b/libre/xchat-libre/xchat-2.8.8-libnotify07.patch index 95d429542..2a6dce9a2 100644 --- a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch +++ b/libre/xchat-libre/xchat-2.8.8-libnotify07.patch @@ -22,4 +22,3 @@ diff -up xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 xchat-2.8.8/src/fe-gtk if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new)) goto bad; if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show)) - diff --git a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch b/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch index 6dad938ea..31e6c0854 100644 --- a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch +++ b/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch @@ -341,4 +341,3 @@ diff -p -U8 xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotifyso4 xchat-2.8.8/src/fe #endif return 1; } - diff --git a/libre/xchat-libre/xchat.install b/libre/xchat-libre/xchat.install new file mode 100644 index 000000000..eab82d16f --- /dev/null +++ b/libre/xchat-libre/xchat.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/multilib-testing/lib32-xcb-util/PKGBUILD b/multilib-testing/lib32-xcb-util/PKGBUILD new file mode 100644 index 000000000..7f012e57f --- /dev/null +++ b/multilib-testing/lib32-xcb-util/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 71728 2012-06-01 20:31:22Z lcarlier $ +# Maintainer : Ionut Biru + +_pkgbasename=xcb-util +pkgname=lib32-xcb-util +pkgver=0.3.9 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding (32-bit)" +arch=('x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('lib32-glibc' 'lib32-libxcb' $_pkgbasename) +makedepends=('gperf' 'gcc-multilib') +options=('!libtool') +source=(http://xcb.freedesktop.org/dist/${_pkgbasename}-${pkgver}.tar.bz2) +sha256sums=('c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/${_pkgbasename}-${pkgver}" + ./configure --prefix=/usr --libdir=/usr/lib32 --disable-static + make +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}"/usr/{include,share} + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD index 5a5c9fc2c..3804b7ee1 100644 --- a/multilib/lib32-mesa/PKGBUILD +++ b/multilib/lib32-mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 71024 2012-05-21 22:26:05Z lcarlier $ +# $Id: PKGBUILD 71697 2012-06-01 13:11:41Z lcarlier $ # Contributor: Jan de Groot # Contributor: Andreas Radke @@ -16,23 +16,23 @@ if [ "${_git}" = "true" ]; then pkgver=8.0.3 fi -pkgrel=3 +pkgrel=3.1 arch=('x86_64') -makedepends=('glproto>=1.4.15' 'lib32-libdrm>=2.4.31' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.99.1' +makedepends=('glproto>=1.4.15' 'lib32-libdrm>=2.4.33' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.99.1' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' 'imake' 'lib32-llvm' 'namcap') url="http://mesa3d.sourceforge.net" license=('custom') +source=('mesa-8.0.3-llvm-3.1-fixes.patch') if [ "${_git}" = "true" ]; then # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 - #source=('ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') source=("MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") md5sums=('817a63bb60b81f4f817ffc9ed0a3dddd') else - source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2") - #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2") - md5sums=('cc5ee15e306b8c15da6a478923797171') + source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2") + md5sums=('0082f4d17674155aa13bc611a5687788' + 'cc5ee15e306b8c15da6a478923797171') fi -options=('!buildflags') +#options=('!buildflags') build() { export CC="gcc -m32" @@ -47,6 +47,8 @@ build() { cd ${srcdir}/?esa-* + patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch" + autoreconf -vfi if [ "${_git}" = "true" ]; then diff --git a/multilib/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/multilib/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch new file mode 100644 index 000000000..922577aef --- /dev/null +++ b/multilib/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch @@ -0,0 +1,44 @@ +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +index a50a51d..f1bb4d9 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +@@ -235,7 +235,24 @@ lp_disassemble(const void* func) + int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); + #endif + +-#if HAVE_LLVM >= 0x0300 ++#if HAVE_LLVM >= 0x0301 ++ OwningPtr MRI(T->createMCRegInfo(Triple)); ++ if (!MRI) { ++ debug_printf("error: no register info for target %s\n", Triple.c_str()); ++ return; ++ } ++ ++ OwningPtr MII(T->createMCInstrInfo()); ++ if (!MII) { ++ debug_printf("error: no instruction info for target %s\n", Triple.c_str()); ++ return; ++ } ++#endif ++ ++#if HAVE_LLVM >= 0x0301 ++ OwningPtr Printer( ++ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); ++#elif HAVE_LLVM == 0x0300 + OwningPtr Printer( + T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); + #elif HAVE_LLVM >= 0x0208 +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index fe7616b..68f8808 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -62,7 +62,11 @@ + extern "C" void + lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE) + { ++#if HAVE_LLVM >= 0x0301 ++ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener()); ++#else + llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener()); ++#endif + } diff --git a/testing/db/PKGBUILD b/testing/db/PKGBUILD new file mode 100644 index 000000000..c68344b0f --- /dev/null +++ b/testing/db/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 160337 2012-06-01 10:23:18Z stephane $ +# Maintainer: Stéphane Gaudreault +# Contributor: Allan McRae +# Contributor: Andreas Radke + +pkgname=db +pkgver=5.3.21 +pkgrel=1 +pkgdesc="The Berkeley DB embedded database system" +arch=('i686' 'x86_64') +url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" +license=('custom') +depends=('gcc-libs' 'sh') +options=('!libtool') +install=db.install +source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz) +sha1sums=('32e43c4898c8996750c958a90c174bd116fcba83') + +build() { + cd "${srcdir}"/$pkgname-${pkgver}/build_unix + ../dist/configure --prefix=/usr --enable-compat185 \ + --enable-shared --enable-static --enable-cxx --enable-dbm + make LIBSO_LIBS=-lpthread +} + +package() { + cd "${srcdir}"/$pkgname-${pkgver}/build_unix + make DESTDIR="${pkgdir}" install + rm -r "${pkgdir}"/usr/docs + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/db/db.install b/testing/db/db.install new file mode 100644 index 000000000..03b64042d --- /dev/null +++ b/testing/db/db.install @@ -0,0 +1,5 @@ +post_upgrade() { + if [ "$(vercmp $2 5.1)" -lt 0 ]; then + echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases." + fi +} diff --git a/testing/imagemagick/PKGBUILD b/testing/imagemagick/PKGBUILD index be11a341f..5c69c66c5 100644 --- a/testing/imagemagick/PKGBUILD +++ b/testing/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159847 2012-05-27 07:42:26Z bluewind $ +# $Id: PKGBUILD 160328 2012-06-01 05:36:53Z eric $ # Maintainer: Eric Bélanger pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.7.0 +pkgver=6.7.7.5 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('cf60b4e9ae6a55777082c7a0b1adb59f31f0865e' +sha1sums=('44b307c97c9bc27f60963306c82e2de5e37dcfb5' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { @@ -33,7 +33,7 @@ build() { check() { cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} -# make check + make check } package_imagemagick() { diff --git a/testing/libusbx/PKGBUILD b/testing/libusbx/PKGBUILD new file mode 100644 index 000000000..800d1542b --- /dev/null +++ b/testing/libusbx/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 160333 2012-06-01 09:33:39Z tpowa $ +# Maintainer: Tobias Powalowski +pkgname=libusbx +pkgver=1.0.11 +pkgrel=2 +depends=('glibc') +pkgdesc="Library that provides generic access to USB device" +arch=(i686 x86_64) +url="http://libusbx.org" +license=('LGPL') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +options=(!libtool) +replaces=('libusb1' 'libusb') +provides=("libusb=$pkgver") +conflicts=("libusb") + +md5sums=('9aaab6aee72f65900cc731ecbffb4cf4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package () { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/mkinitcpio-busybox/PKGBUILD b/testing/mkinitcpio-busybox/PKGBUILD new file mode 100644 index 000000000..32cb89cd7 --- /dev/null +++ b/testing/mkinitcpio-busybox/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 160402 2012-06-01 18:19:59Z dreisner $ +# Maintainer: Dave Reisner +# Maintainer: Thomas Bächler + +pkgname=mkinitcpio-busybox +pkgver=1.20.1 +pkgrel=1 +pkgdesc="base initramfs tools" +arch=('i686' 'x86_64') +url="http://www.busybox.net/" +license=('GPL') +depends=('glibc') +options=('!buildflags') +source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" + 'config') +sha256sums=('3e515d8abefd8583ebabffdcfccecb3b8deacf2cef7c69ab1d8755a012ec68c9' + 'd8064ed6ec21868e4afe057445e2d852b353abd595132cb1ca3ba345988772f0') + +build() { + cd "$srcdir/busybox-$pkgver" + + local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" + + sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \ + "$srcdir/config" > .config + + make +} + +package() { + install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/usr/lib/initcpio/busybox" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/mkinitcpio-busybox/config b/testing/mkinitcpio-busybox/config new file mode 100644 index 000000000..ed84c5383 --- /dev/null +++ b/testing/mkinitcpio-busybox/config @@ -0,0 +1,1020 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.20.0 +# Sun May 13 11:33:40 2012 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_DESKTOP is not set +# CONFIG_EXTRA_COMPAT is not set +# CONFIG_INCLUDE_SUSv2 is not set +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=y +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +# CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_COMPRESS_USAGE is not set +CONFIG_FEATURE_INSTALLER=y +# CONFIG_INSTALL_NO_USR is not set +# CONFIG_LOCALE_SUPPORT is not set +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set +CONFIG_LONG_OPTS=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set +# CONFIG_FEATURE_PIDFILE is not set +CONFIG_FEATURE_SUID=y +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox" +CONFIG_FEATURE_SYSLOG=y +# CONFIG_FEATURE_HAVE_RPC is not set + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_SYSROOT="" +CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing" +CONFIG_EXTRA_LDFLAGS="" +CONFIG_EXTRA_LDLIBS="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set + +# +# Installation Options ("make install" behavior) +# +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +# CONFIG_FEATURE_SYSTEMD is not set +# CONFIG_FEATURE_RTMINMAX is not set +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SMALL=0 +CONFIG_FEATURE_FAST_TOP=y +# CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_USE_TERMIOS is not set +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +# CONFIG_FEATURE_EDITING_VI is not set +CONFIG_FEATURE_EDITING_HISTORY=15 +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set +# CONFIG_FEATURE_REVERSE_SEARCH is not set +CONFIG_FEATURE_TAB_COMPLETION=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set +CONFIG_FEATURE_NON_POSIX_CP=y +CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_FEATURE_SKIP_ROOTFS=y +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y +# CONFIG_FEATURE_HWIB is not set + +# +# Applets +# + +# +# Archival Utilities +# +# CONFIG_FEATURE_SEAMLESS_XZ is not set +# CONFIG_FEATURE_SEAMLESS_LZMA is not set +# CONFIG_FEATURE_SEAMLESS_BZ2 is not set +CONFIG_FEATURE_SEAMLESS_GZ=y +# CONFIG_FEATURE_SEAMLESS_Z is not set +# CONFIG_AR is not set +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +# CONFIG_FEATURE_AR_CREATE is not set +# CONFIG_BUNZIP2 is not set +# CONFIG_BZIP2 is not set +# CONFIG_CPIO is not set +# CONFIG_FEATURE_CPIO_O is not set +# CONFIG_FEATURE_CPIO_P is not set +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +# CONFIG_GUNZIP is not set +# CONFIG_GZIP is not set +# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set +CONFIG_GZIP_FAST=0 +# CONFIG_LZOP is not set +# CONFIG_LZOP_COMPR_HIGH is not set +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +# CONFIG_TAR is not set +# CONFIG_FEATURE_TAR_CREATE is not set +# CONFIG_FEATURE_TAR_AUTODETECT is not set +# CONFIG_FEATURE_TAR_FROM is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set +# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_FEATURE_TAR_TO_COMMAND is not set +# CONFIG_FEATURE_TAR_UNAME_GNAME is not set +# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set +# CONFIG_FEATURE_TAR_SELINUX is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +# CONFIG_LZMA is not set +# CONFIG_UNXZ is not set +# CONFIG_XZ is not set +# CONFIG_UNZIP is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +# CONFIG_DATE is not set +# CONFIG_FEATURE_DATE_ISOFMT is not set +# CONFIG_FEATURE_DATE_NANO is not set +# CONFIG_FEATURE_DATE_COMPAT is not set +# CONFIG_HOSTID is not set +# CONFIG_ID is not set +# CONFIG_GROUPS is not set +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y +# CONFIG_FEATURE_TOUCH_SUSV3 is not set +# CONFIG_TR is not set +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set +# CONFIG_BASE64 is not set +# CONFIG_WHO is not set +# CONFIG_USERS is not set +# CONFIG_CAL is not set +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +# CONFIG_COMM is not set +CONFIG_CP=y +# CONFIG_FEATURE_CP_LONG_OPTIONS is not set +CONFIG_CUT=y +CONFIG_DD=y +# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set +# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_DF=y +# CONFIG_FEATURE_DF_FANCY is not set +CONFIG_DIRNAME=y +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +CONFIG_DU=y +# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +# CONFIG_EXPAND is not set +# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FALSE=y +# CONFIG_FOLD is not set +# CONFIG_FSYNC is not set +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LN=y +# CONFIG_LOGNAME is not set +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +# CONFIG_FEATURE_LS_COLOR is not set +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +# CONFIG_NICE is not set +# CONFIG_NOHUP is not set +# CONFIG_OD is not set +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +# CONFIG_REALPATH is not set +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_FEATURE_FLOAT_SLEEP=y +CONFIG_SORT=y +# CONFIG_FEATURE_SORT_BIG is not set +# CONFIG_SPLIT is not set +# CONFIG_FEATURE_SPLIT_FANCY is not set +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +# CONFIG_STTY is not set +# CONFIG_SUM is not set +# CONFIG_SYNC is not set +CONFIG_TAC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +# CONFIG_TEE is not set +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TRUE=y +# CONFIG_TTY is not set +CONFIG_UNAME=y +# CONFIG_UNEXPAND is not set +# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set +CONFIG_UNIQ=y +# CONFIG_USLEEP is not set +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +# CONFIG_WHOAMI is not set +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +# CONFIG_CHVT is not set +# CONFIG_FGCONSOLE is not set +CONFIG_CLEAR=y +# CONFIG_DEALLOCVT is not set +# CONFIG_DUMPKMAP is not set +CONFIG_KBD_MODE=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +# CONFIG_RESET is not set +# CONFIG_RESIZE is not set +# CONFIG_FEATURE_RESIZE_PRINT is not set +# CONFIG_SETCONSOLE is not set +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +CONFIG_SETFONT=y +# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set +CONFIG_DEFAULT_SETFONT_DIR="" +# CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set +# CONFIG_SHOWKEY is not set + +# +# Common options for loadfont and setfont +# +CONFIG_FEATURE_LOADFONT_PSF2=y +CONFIG_FEATURE_LOADFONT_RAW=y + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +# CONFIG_RUN_PARTS is not set +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +# CONFIG_FEATURE_RUN_PARTS_FANCY is not set +# CONFIG_START_STOP_DAEMON is not set +# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set +# CONFIG_WHICH is not set + +# +# Editors +# +# CONFIG_PATCH is not set +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=4096 +CONFIG_FEATURE_VI_8BIT=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_AWK=y +# CONFIG_FEATURE_AWK_LIBM is not set +# CONFIG_CMP is not set +# CONFIG_DIFF is not set +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +# CONFIG_FEATURE_DIFF_DIR is not set +# CONFIG_ED is not set +CONFIG_SED=y +# CONFIG_FEATURE_ALLOW_EXEC is not set + +# +# Finding Utilities +# +# CONFIG_FIND is not set +# CONFIG_FEATURE_FIND_PRINT0 is not set +# CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_MMIN is not set +# CONFIG_FEATURE_FIND_PERM is not set +# CONFIG_FEATURE_FIND_TYPE is not set +# CONFIG_FEATURE_FIND_XDEV is not set +# CONFIG_FEATURE_FIND_MAXDEPTH is not set +# CONFIG_FEATURE_FIND_NEWER is not set +# CONFIG_FEATURE_FIND_INUM is not set +# CONFIG_FEATURE_FIND_EXEC is not set +# CONFIG_FEATURE_FIND_USER is not set +# CONFIG_FEATURE_FIND_GROUP is not set +# CONFIG_FEATURE_FIND_NOT is not set +# CONFIG_FEATURE_FIND_DEPTH is not set +# CONFIG_FEATURE_FIND_PAREN is not set +# CONFIG_FEATURE_FIND_SIZE is not set +# CONFIG_FEATURE_FIND_PRUNE is not set +# CONFIG_FEATURE_FIND_DELETE is not set +# CONFIG_FEATURE_FIND_PATH is not set +# CONFIG_FEATURE_FIND_REGEX is not set +# CONFIG_FEATURE_FIND_CONTEXT is not set +# CONFIG_FEATURE_FIND_LINKS is not set +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set +# CONFIG_FEATURE_GREP_CONTEXT is not set +# CONFIG_XARGS is not set +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set + +# +# Init Utilities +# +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set +CONFIG_HALT=y +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +CONFIG_INIT=y +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_KILL_REMOVED is not set +CONFIG_FEATURE_KILL_DELAY=0 +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_INIT_SYSLOG is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +CONFIG_INIT_TERMINAL_TYPE="" +# CONFIG_MESG is not set +# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set + +# +# Login/Password Management Utilities +# +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_CRYPT is not set +# CONFIG_USE_BB_CRYPT_SHA is not set +# CONFIG_ADDUSER is not set +# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +# CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_FIRST_SYSTEM_ID=0 +CONFIG_LAST_SYSTEM_ID=0 +# CONFIG_ADDGROUP is not set +# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set +# CONFIG_DELUSER is not set +# CONFIG_DELGROUP is not set +# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set +# CONFIG_GETTY is not set +# CONFIG_LOGIN is not set +# CONFIG_LOGIN_SESSION_AS_CHILD is not set +# CONFIG_PAM is not set +# CONFIG_LOGIN_SCRIPTS is not set +# CONFIG_FEATURE_NOLOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set +# CONFIG_PASSWD is not set +# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set +# CONFIG_CRYPTPW is not set +# CONFIG_CHPASSWD is not set +CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" +# CONFIG_SU is not set +# CONFIG_FEATURE_SU_SYSLOG is not set +# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +# CONFIG_CHATTR is not set +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set +# CONFIG_TUNE2FS is not set + +# +# Linux Module Utilities +# +# CONFIG_MODINFO is not set +# CONFIG_MODPROBE_SMALL is not set +# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set +# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set +# CONFIG_INSMOD is not set +# CONFIG_RMMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set +# CONFIG_DEPMOD is not set + +# +# Options common to multiple modutils +# +# CONFIG_FEATURE_2_4_MODULES is not set +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +# CONFIG_FEATURE_MODUTILS_ALIAS is not set +# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set +CONFIG_DEFAULT_MODULES_DIR="" +CONFIG_DEFAULT_DEPMOD_FILE="" + +# +# Linux System Utilities +# +# CONFIG_BLOCKDEV is not set +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_RENAME is not set +# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +# CONFIG_REV is not set +# CONFIG_ACPID is not set +# CONFIG_FEATURE_ACPID_COMPAT is not set +# CONFIG_BLKID is not set +# CONFIG_FEATURE_BLKID_TYPE is not set +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +# CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +# CONFIG_FDISK is not set +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set +# CONFIG_FEATURE_FDISK_WRITABLE is not set +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_GPT_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FINDFS is not set +# CONFIG_FLOCK is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_EXT2 is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +# CONFIG_MKFS_REISER is not set +# CONFIG_MKFS_VFAT is not set +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +# CONFIG_FEATURE_HEXDUMP_REVERSE is not set +# CONFIG_HD is not set +# CONFIG_HWCLOCK is not set +# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +# CONFIG_LSPCI is not set +# CONFIG_LSUSB is not set +# CONFIG_MKSWAP is not set +# CONFIG_FEATURE_MKSWAP_UUID is not set +# CONFIG_MORE is not set +# CONFIG_MOUNT is not set +# CONFIG_FEATURE_MOUNT_FAKE is not set +# CONFIG_FEATURE_MOUNT_VERBOSE is not set +# CONFIG_FEATURE_MOUNT_HELPERS is not set +# CONFIG_FEATURE_MOUNT_LABEL is not set +# CONFIG_FEATURE_MOUNT_NFS is not set +# CONFIG_FEATURE_MOUNT_CIFS is not set +# CONFIG_FEATURE_MOUNT_FLAGS is not set +# CONFIG_FEATURE_MOUNT_FSTAB is not set +# CONFIG_PIVOT_ROOT is not set +# CONFIG_RDATE is not set +# CONFIG_RDEV is not set +# CONFIG_READPROFILE is not set +# CONFIG_RTCWAKE is not set +# CONFIG_SCRIPT is not set +# CONFIG_SCRIPTREPLAY is not set +# CONFIG_SETARCH is not set +# CONFIG_SWAPONOFF is not set +# CONFIG_FEATURE_SWAPON_PRI is not set +# CONFIG_SWITCH_ROOT is not set +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set +# CONFIG_VOLUMEID is not set +# CONFIG_FEATURE_VOLUMEID_EXT is not set +# CONFIG_FEATURE_VOLUMEID_BTRFS is not set +# CONFIG_FEATURE_VOLUMEID_REISERFS is not set +# CONFIG_FEATURE_VOLUMEID_FAT is not set +# CONFIG_FEATURE_VOLUMEID_HFS is not set +# CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_XFS is not set +# CONFIG_FEATURE_VOLUMEID_NTFS is not set +# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set +# CONFIG_FEATURE_VOLUMEID_UDF is not set +# CONFIG_FEATURE_VOLUMEID_LUKS is not set +# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set +# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +# CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SYSV is not set +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set + +# +# Miscellaneous Utilities +# +# CONFIG_CONSPY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_FEATURE_LESS_WINCH is not set +# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set +# CONFIG_FEATURE_LESS_DASHCMD is not set +# CONFIG_FEATURE_LESS_LINENUMS is not set +# CONFIG_NANDWRITE is not set +# CONFIG_NANDDUMP is not set +# CONFIG_SETSERIAL is not set +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set +# CONFIG_BEEP is not set +CONFIG_FEATURE_BEEP_FREQ=0 +CONFIG_FEATURE_BEEP_LENGTH_MS=0 +# CONFIG_CHAT is not set +# CONFIG_FEATURE_CHAT_NOFAIL is not set +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set +# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set +# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set +# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set +# CONFIG_FEATURE_CHAT_CLR_ABORT is not set +# CONFIG_CHRT is not set +# CONFIG_CROND is not set +# CONFIG_FEATURE_CROND_D is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_FEATURE_CROND_DIR="" +# CONFIG_CRONTAB is not set +# CONFIG_DC is not set +# CONFIG_FEATURE_DC_LIBM is not set +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_DEVMEM is not set +# CONFIG_EJECT is not set +# CONFIG_FEATURE_EJECT_SCSI is not set +# CONFIG_FBSPLASH is not set +# CONFIG_FLASHCP is not set +# CONFIG_FLASH_LOCK is not set +# CONFIG_FLASH_UNLOCK is not set +# CONFIG_FLASH_ERASEALL is not set +# CONFIG_IONICE is not set +# CONFIG_INOTIFYD is not set +# CONFIG_LAST is not set +# CONFIG_FEATURE_LAST_SMALL is not set +# CONFIG_FEATURE_LAST_FANCY is not set +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MAN is not set +# CONFIG_MICROCOM is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RAIDAUTORUN is not set +# CONFIG_READAHEAD is not set +# CONFIG_RFKILL is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +# CONFIG_SETSID is not set +CONFIG_STRINGS=y +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_TIME is not set +# CONFIG_TIMEOUT is not set +# CONFIG_TTYSIZE is not set +# CONFIG_VOLNAME is not set +# CONFIG_WALL is not set +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +# CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +# CONFIG_NBDCLIENT is not set +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +# CONFIG_NC_110_COMPAT is not set +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_WHOIS is not set +CONFIG_FEATURE_IPV6=y +# CONFIG_FEATURE_UNIX_LOCAL is not set +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_ARP is not set +# CONFIG_ARPING is not set +# CONFIG_BRCTL is not set +# CONFIG_FEATURE_BRCTL_FANCY is not set +# CONFIG_FEATURE_BRCTL_SHOW is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPD is not set +# CONFIG_FEATURE_FTP_WRITE is not set +# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +# CONFIG_HOSTNAME is not set +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set +# CONFIG_FEATURE_HTTPD_PROXY is not set +# CONFIG_FEATURE_HTTPD_GZIP is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +CONFIG_FEATURE_IFCONFIG_SLIP=y +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +# CONFIG_IFENSLAVE is not set +# CONFIG_IFPLUGD is not set +# CONFIG_IFUPDOWN is not set +CONFIG_IFUPDOWN_IFSTATE_PATH="" +# CONFIG_FEATURE_IFUPDOWN_IP is not set +# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set +# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set +# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +CONFIG_NETSTAT=y +CONFIG_FEATURE_NETSTAT_WIDE=y +CONFIG_FEATURE_NETSTAT_PRG=y +CONFIG_NSLOOKUP=y +# CONFIG_NTPD is not set +# CONFIG_FEATURE_NTPD_SERVER is not set +# CONFIG_PSCAN is not set +CONFIG_ROUTE=y +# CONFIG_SLATTACH is not set +# CONFIG_TCPSVD is not set +CONFIG_TELNET=y +# CONFIG_FEATURE_TELNET_TTYPE is not set +# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_STANDALONE is not set +# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set +CONFIG_TFTP=y +# CONFIG_TFTPD is not set + +# +# Common options for tftp/tftpd +# +CONFIG_FEATURE_TFTP_GET=y +# CONFIG_FEATURE_TFTP_PUT is not set +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +# CONFIG_TFTP_DEBUG is not set +# CONFIG_TRACEROUTE is not set +# CONFIG_TRACEROUTE6 is not set +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +# CONFIG_TUNCTL is not set +# CONFIG_FEATURE_TUNCTL_UG is not set +# CONFIG_UDHCPC6 is not set +# CONFIG_UDHCPD is not set +# CONFIG_DHCPRELAY is not set +# CONFIG_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +CONFIG_DHCPD_LEASES_FILE="" +# CONFIG_UDHCPC is not set +# CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCP_PORT is not set +CONFIG_UDHCP_DEBUG=0 +# CONFIG_FEATURE_UDHCP_RFC3397 is not set +# CONFIG_FEATURE_UDHCP_8021Q is not set +CONFIG_UDHCPC_DEFAULT_SCRIPT="" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +# CONFIG_UDPSVD is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y +# CONFIG_ZCIP is not set + +# +# Print Utilities +# +# CONFIG_LPD is not set +# CONFIG_LPR is not set +# CONFIG_LPQ is not set + +# +# Mail Utilities +# +# CONFIG_MAKEMIME is not set +CONFIG_FEATURE_MIME_CHARSET="" +# CONFIG_POPMAILDIR is not set +# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set +# CONFIG_REFORMIME is not set +# CONFIG_FEATURE_REFORMIME_COMPAT is not set +# CONFIG_SENDMAIL is not set + +# +# Process Utilities +# +# CONFIG_IOSTAT is not set +# CONFIG_LSOF is not set +# CONFIG_MPSTAT is not set +# CONFIG_NMETER is not set +# CONFIG_PMAP is not set +# CONFIG_POWERTOP is not set +# CONFIG_PSTREE is not set +# CONFIG_PWDX is not set +# CONFIG_SMEMCAP is not set +CONFIG_UPTIME=y +# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set +CONFIG_FREE=y +# CONFIG_FUSER is not set +CONFIG_KILL=y +CONFIG_KILLALL=y +# CONFIG_KILLALL5 is not set +CONFIG_PGREP=y +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +# CONFIG_PKILL is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_FEATURE_PS_LONG=y +# CONFIG_FEATURE_PS_TIME is not set +# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +# CONFIG_RENICE is not set +# CONFIG_BB_SYSCTL is not set +# CONFIG_TOP is not set +# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set +# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set +# CONFIG_FEATURE_TOP_SMP_CPU is not set +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOP_SMP_PROCESS is not set +# CONFIG_FEATURE_TOPMEM is not set +# CONFIG_FEATURE_SHOW_THREADS is not set +# CONFIG_WATCH is not set + +# +# Runit Utilities +# +# CONFIG_RUNSV is not set +# CONFIG_RUNSVDIR is not set +# CONFIG_FEATURE_RUNSVDIR_LOG is not set +# CONFIG_SV is not set +CONFIG_SV_DEFAULT_SERVICE_DIR="" +# CONFIG_SVLOGD is not set +# CONFIG_CHPST is not set +# CONFIG_SETUIDGID is not set +# CONFIG_ENVUIDGID is not set +# CONFIG_ENVDIR is not set +# CONFIG_SOFTLIMIT is not set +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Shells +# +CONFIG_ASH=y +CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_IDLE_TIMEOUT is not set +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_CMDCMD=y +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y +CONFIG_CTTYHACK=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_HUSH_CASE is not set +# CONFIG_HUSH_FUNCTIONS is not set +# CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y +CONFIG_SH_MATH_SUPPORT=y +# CONFIG_SH_MATH_SUPPORT_64 is not set +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_FEATURE_SH_NOFORK is not set +# CONFIG_FEATURE_SH_HISTFILESIZE is not set + +# +# System Logging Utilities +# +# CONFIG_SYSLOGD is not set +# CONFIG_FEATURE_ROTATE_LOGFILE is not set +# CONFIG_FEATURE_REMOTE_LOG is not set +# CONFIG_FEATURE_SYSLOGD_DUP is not set +# CONFIG_FEATURE_SYSLOGD_CFG is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 +# CONFIG_FEATURE_IPC_SYSLOG is not set +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 +# CONFIG_LOGREAD is not set +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +# CONFIG_KLOGD is not set +# CONFIG_FEATURE_KLOGD_KLOGCTL is not set +# CONFIG_LOGGER is not set diff --git a/testing/openldap/PKGBUILD b/testing/openldap/PKGBUILD new file mode 100644 index 000000000..6639dc5ee --- /dev/null +++ b/testing/openldap/PKGBUILD @@ -0,0 +1,102 @@ +# $Id: PKGBUILD 160339 2012-06-01 10:23:21Z stephane $ +# Maintainer: + +pkgbase=openldap +pkgname=('libldap' 'openldap') +pkgver=2.4.31 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.openldap.org/" +license=('custom') +makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux') +source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz + slapd slapd.default + ntlm.patch + mutex-end-of-struct-sigsegv.patch) +sha1sums=('8315a283fb3724abe6062e38d93bb69298d05765' + 'bd1ea19256d3d467f1f803e0f4046ef50f17628f' + 'd89b8a533045123f1ab46c9c430cf132d58a20a4' + 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef' + '694269dad78c7a806649c2d7f57bb7e503df3af1') + +build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -Np1 -i "${srcdir}"/ntlm.patch + patch -Np1 -i "${srcdir}"/mutex-end-of-struct-sigsegv.patch + + sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in + sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h + sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf + sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in + + LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib" + ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \ + --sysconfdir=/etc --localstatedir=/var/lib/openldap \ + --enable-ipv6 --enable-syslog --enable-local \ + --enable-bdb --enable-hdb \ + --enable-crypt --enable-dynamic \ + --with-threads --disable-wrappers \ + --without-fetch \ + --enable-spasswd --with-cyrus-sasl \ + --enable-overlays=mod --enable-modules=yes + make +} + +check() { + cd "${srcdir}"/${pkgbase}-${pkgver} + make test +} + +package_libldap() { + pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries" + depends=('libsasl' 'e2fsprogs') + backup=('etc/openldap/ldap.conf') + options=('!libtool') + + cd "${srcdir}"/${pkgbase}-${pkgver} + for dir in include libraries doc/man/man3 ; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5 + +# get rid of duplicate default conf files + rm "${pkgdir}"/etc/openldap/*.default + + ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2 + ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2 + + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + +package_openldap() { + pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server" + depends=("libldap>=${pkgver}" 'libltdl' 'util-linux') + backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd') + options=('!libtool' 'emptydirs') + install=openldap.install + + cd "${srcdir}"/${pkgbase}-${pkgver} + for dir in clients servers doc/man/man{1,5,8} ; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5 + rm -r "${pkgdir}"/run + +# get rid of duplicate default conf files + rm "${pkgdir}"/etc/openldap/*.default + + ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd + + chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} + chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} + + install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap + install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d + install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd + install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/openldap/mutex-end-of-struct-sigsegv.patch b/testing/openldap/mutex-end-of-struct-sigsegv.patch new file mode 100644 index 000000000..e8996386a --- /dev/null +++ b/testing/openldap/mutex-end-of-struct-sigsegv.patch @@ -0,0 +1,293 @@ + libraries/libldap/init.c | 8 ++- + libraries/libldap/ldap-int.h | 198 ++++++++++++++++++++++-------------------- + 2 files changed, 110 insertions(+), 96 deletions(-) + +diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c +index 39292d2..9d37e64 100644 +--- a/libraries/libldap/init.c ++++ b/libraries/libldap/init.c +@@ -36,7 +36,13 @@ + #include "lutil.h" + + struct ldapoptions ldap_int_global_options = +- { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE LDAP_LDO_MUTEX_NULLARG }; ++ { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE ++ LDAP_LDO_NULLARG ++ LDAP_LDO_CONNECTIONLESS_NULLARG ++ LDAP_LDO_TLS_NULLARG ++ LDAP_LDO_SASL_NULLARG ++ LDAP_LDO_GSSAPI_NULLARG ++ LDAP_LDO_MUTEX_NULLARG }; + + #define ATTR_NONE 0 + #define ATTR_BOOL 1 +diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h +index f8e6126..ac6c9e5 100644 +--- a/libraries/libldap/ldap-int.h ++++ b/libraries/libldap/ldap-int.h +@@ -185,29 +185,59 @@ struct ldapoptions { + #define LDAP_TRASHED_SESSION 0xFF + int ldo_debug; + +-#ifdef LDAP_R_COMPILE +- ldap_pvt_thread_mutex_t ldo_mutex; +-#define LDAP_LDO_MUTEX_NULLARG , LDAP_PVT_MUTEX_NULL +-#else +-#define LDAP_LDO_MUTEX_NULLARG +-#endif ++ ber_int_t ldo_version; ++ ber_int_t ldo_deref; ++ ber_int_t ldo_timelimit; ++ ber_int_t ldo_sizelimit; ++ ++ /* per API call timeout */ ++ struct timeval ldo_tm_api; ++ struct timeval ldo_tm_net; ++ ++ LDAPURLDesc *ldo_defludp; ++ int ldo_defport; ++ char* ldo_defbase; ++ char* ldo_defbinddn; /* bind dn */ ++ ++ /* ++ * Per connection tcp-keepalive settings (Linux only, ++ * ignored where unsupported) ++ */ ++ ber_int_t ldo_keepalive_idle; ++ ber_int_t ldo_keepalive_probes; ++ ber_int_t ldo_keepalive_interval; ++ ++ int ldo_refhoplimit; /* limit on referral nesting */ ++ ++ /* LDAPv3 server and client controls */ ++ LDAPControl **ldo_sctrls; ++ LDAPControl **ldo_cctrls; ++ ++ /* LDAP rebind callback function */ ++ LDAP_REBIND_PROC *ldo_rebind_proc; ++ void *ldo_rebind_params; ++ LDAP_NEXTREF_PROC *ldo_nextref_proc; ++ void *ldo_nextref_params; ++ LDAP_URLLIST_PROC *ldo_urllist_proc; ++ void *ldo_urllist_params; ++ ++ /* LDAP connection callback stack */ ++ ldaplist *ldo_conn_cbs; ++ ++ LDAP_BOOLEANS ldo_booleans; /* boolean options */ ++ ++#define LDAP_LDO_NULLARG ,0,0,0,0 ,{0},{0} ,0,0,0,0, 0,0,0,0, 0,0, 0,0,0,0,0,0, 0, 0 + + #ifdef LDAP_CONNECTIONLESS + #define LDAP_IS_UDP(ld) ((ld)->ld_options.ldo_is_udp) + void* ldo_peer; /* struct sockaddr* */ + char* ldo_cldapdn; + int ldo_is_udp; ++#define LDAP_LDO_CONNECTIONLESS_NULLARG ,0,0,0 ++#else ++#define LDAP_LDO_CONNECTIONLESS_NULLARG + #endif + +- /* per API call timeout */ +- struct timeval ldo_tm_api; +- struct timeval ldo_tm_net; +- +- ber_int_t ldo_version; +- ber_int_t ldo_deref; +- ber_int_t ldo_timelimit; +- ber_int_t ldo_sizelimit; +- + #ifdef HAVE_TLS + /* tls context */ + void *ldo_tls_ctx; +@@ -226,16 +256,12 @@ struct ldapoptions { + int ldo_tls_mode; + int ldo_tls_require_cert; + int ldo_tls_impl; +-#ifdef HAVE_OPENSSL_CRL + int ldo_tls_crlcheck; +-#endif ++#define LDAP_LDO_TLS_NULLARG ,0,0,0,{0,0,0,0,0,0,0,0,0},0,0,0,0 ++#else ++#define LDAP_LDO_TLS_NULLARG + #endif + +- LDAPURLDesc *ldo_defludp; +- int ldo_defport; +- char* ldo_defbase; +- char* ldo_defbinddn; /* bind dn */ +- + #ifdef HAVE_CYRUS_SASL + char* ldo_def_sasl_mech; /* SASL Mechanism(s) */ + char* ldo_def_sasl_realm; /* SASL realm */ +@@ -244,6 +270,9 @@ struct ldapoptions { + + /* SASL Security Properties */ + struct sasl_security_properties ldo_sasl_secprops; ++#define LDAP_LDO_SASL_NULLARG ,0,0,0,0,{0} ++#else ++#define LDAP_LDO_SASL_NULLARG + #endif + + #ifdef HAVE_GSSAPI +@@ -253,34 +282,17 @@ struct ldapoptions { + #define LDAP_GSSAPI_OPT_DO_NOT_FREE_GSS_CONTEXT 0x0001 + #define LDAP_GSSAPI_OPT_ALLOW_REMOTE_PRINCIPAL 0x0002 + unsigned ldo_gssapi_options; ++#define LDAP_LDO_GSSAPI_NULLARG ,0,0 ++#else ++#define LDAP_LDO_GSSAPI_NULLARG + #endif + +- /* +- * Per connection tcp-keepalive settings (Linux only, +- * ignored where unsupported) +- */ +- ber_int_t ldo_keepalive_idle; +- ber_int_t ldo_keepalive_probes; +- ber_int_t ldo_keepalive_interval; +- +- int ldo_refhoplimit; /* limit on referral nesting */ +- +- /* LDAPv3 server and client controls */ +- LDAPControl **ldo_sctrls; +- LDAPControl **ldo_cctrls; +- +- /* LDAP rebind callback function */ +- LDAP_REBIND_PROC *ldo_rebind_proc; +- void *ldo_rebind_params; +- LDAP_NEXTREF_PROC *ldo_nextref_proc; +- void *ldo_nextref_params; +- LDAP_URLLIST_PROC *ldo_urllist_proc; +- void *ldo_urllist_params; +- +- /* LDAP connection callback stack */ +- ldaplist *ldo_conn_cbs; +- +- LDAP_BOOLEANS ldo_booleans; /* boolean options */ ++#ifdef LDAP_R_COMPILE ++ ldap_pvt_thread_mutex_t ldo_mutex; ++#define LDAP_LDO_MUTEX_NULLARG , LDAP_PVT_MUTEX_NULL ++#else ++#define LDAP_LDO_MUTEX_NULLARG ++#endif + }; + + +@@ -375,6 +387,46 @@ struct ldap_common { + Sockbuf *ldc_sb; /* socket descriptor & buffer */ + #define ld_sb ldc->ldc_sb + ++ unsigned short ldc_lberoptions; ++#define ld_lberoptions ldc->ldc_lberoptions ++ ++ /* protected by msgid_mutex */ ++ ber_len_t ldc_msgid; ++#define ld_msgid ldc->ldc_msgid ++ ++ /* do not mess with these */ ++ /* protected by req_mutex */ ++ LDAPRequest *ldc_requests; /* list of outstanding requests */ ++ /* protected by res_mutex */ ++ LDAPMessage *ldc_responses; /* list of outstanding responses */ ++#define ld_requests ldc->ldc_requests ++#define ld_responses ldc->ldc_responses ++ ++ /* protected by abandon_mutex */ ++ ber_len_t ldc_nabandoned; ++ ber_int_t *ldc_abandoned; /* array of abandoned requests */ ++#define ld_nabandoned ldc->ldc_nabandoned ++#define ld_abandoned ldc->ldc_abandoned ++ ++ /* unused by libldap */ ++ LDAPCache *ldc_cache; /* non-null if cache is initialized */ ++#define ld_cache ldc->ldc_cache ++ ++ /* do not mess with the rest though */ ++ ++ /* protected by conn_mutex */ ++ LDAPConn *ldc_defconn; /* default connection */ ++#define ld_defconn ldc->ldc_defconn ++ LDAPConn *ldc_conns; /* list of server connections */ ++#define ld_conns ldc->ldc_conns ++ void *ldc_selectinfo;/* platform specifics for select */ ++#define ld_selectinfo ldc->ldc_selectinfo ++ ++ /* ldap_common refcnt - free only if 0 */ ++ /* protected by ldc_mutex */ ++ unsigned int ldc_refcnt; ++#define ld_ldcrefcnt ldc->ldc_refcnt ++ + /* protected by ldo_mutex */ + struct ldapoptions ldc_options; + #define ld_options ldc->ldc_options +@@ -403,66 +455,22 @@ struct ldap_common { + #define ld_urllist_params ld_options.ldo_urllist_params + + #define ld_version ld_options.ldo_version +-#ifdef LDAP_R_COMPILE +-#define ld_ldopts_mutex ld_options.ldo_mutex +-#endif +- +- unsigned short ldc_lberoptions; +-#define ld_lberoptions ldc->ldc_lberoptions +- +- /* protected by msgid_mutex */ +- ber_len_t ldc_msgid; +-#define ld_msgid ldc->ldc_msgid +- +- /* do not mess with these */ +- /* protected by req_mutex */ +- LDAPRequest *ldc_requests; /* list of outstanding requests */ +- /* protected by res_mutex */ +- LDAPMessage *ldc_responses; /* list of outstanding responses */ +-#define ld_requests ldc->ldc_requests +-#define ld_responses ldc->ldc_responses + + #ifdef LDAP_R_COMPILE ++ ldap_pvt_thread_mutex_t ldc_mutex; + ldap_pvt_thread_mutex_t ldc_msgid_mutex; + ldap_pvt_thread_mutex_t ldc_conn_mutex; + ldap_pvt_thread_mutex_t ldc_req_mutex; + ldap_pvt_thread_mutex_t ldc_res_mutex; + ldap_pvt_thread_mutex_t ldc_abandon_mutex; ++#define ld_ldopts_mutex ld_options.ldo_mutex ++#define ld_ldcmutex ldc->ldc_mutex + #define ld_msgid_mutex ldc->ldc_msgid_mutex + #define ld_conn_mutex ldc->ldc_conn_mutex + #define ld_req_mutex ldc->ldc_req_mutex + #define ld_res_mutex ldc->ldc_res_mutex + #define ld_abandon_mutex ldc->ldc_abandon_mutex + #endif +- +- /* protected by abandon_mutex */ +- ber_len_t ldc_nabandoned; +- ber_int_t *ldc_abandoned; /* array of abandoned requests */ +-#define ld_nabandoned ldc->ldc_nabandoned +-#define ld_abandoned ldc->ldc_abandoned +- +- /* unused by libldap */ +- LDAPCache *ldc_cache; /* non-null if cache is initialized */ +-#define ld_cache ldc->ldc_cache +- +- /* do not mess with the rest though */ +- +- /* protected by conn_mutex */ +- LDAPConn *ldc_defconn; /* default connection */ +-#define ld_defconn ldc->ldc_defconn +- LDAPConn *ldc_conns; /* list of server connections */ +-#define ld_conns ldc->ldc_conns +- void *ldc_selectinfo;/* platform specifics for select */ +-#define ld_selectinfo ldc->ldc_selectinfo +- +- /* ldap_common refcnt - free only if 0 */ +-#ifdef LDAP_R_COMPILE +- ldap_pvt_thread_mutex_t ldc_mutex; +-#define ld_ldcmutex ldc->ldc_mutex +-#endif +- /* protected by ldc_mutex */ +- unsigned int ldc_refcnt; +-#define ld_ldcrefcnt ldc->ldc_refcnt + }; + + struct ldap { diff --git a/testing/openldap/ntlm.patch b/testing/openldap/ntlm.patch new file mode 100644 index 000000000..6804b610d --- /dev/null +++ b/testing/openldap/ntlm.patch @@ -0,0 +1,230 @@ +Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is +actually called by evolution-data-server, checked at version 1.12.2. +Without this patch, the Exchange addressbook integration uses simple binds +with cleartext passwords. + +Russ checked with openldap-software for upstream's opinion on this patch +on 2007-12-21. Upstream had never received it as a patch submission and +given that it's apparently only for older Exchange servers that can't do +SASL and DIGEST-MD5, it's not very appealing. + +Bug#457374 filed against evolution-data-server asking if this support is +still required on 2007-12-21. + +Index: trunk/include/ldap.h +=================================================================== +--- trunk.orig/include/ldap.h ++++ trunk/include/ldap.h +@@ -2461,5 +2461,25 @@ + LDAPControl **ctrls, + LDAPDerefRes **drp )); + ++/* ++ * hacks for NTLM ++ */ ++#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU) ++#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU) ++LDAP_F( int ) ++ldap_ntlm_bind LDAP_P(( ++ LDAP *ld, ++ LDAP_CONST char *dn, ++ ber_tag_t tag, ++ struct berval *cred, ++ LDAPControl **sctrls, ++ LDAPControl **cctrls, ++ int *msgidp )); ++LDAP_F( int ) ++ldap_parse_ntlm_bind_result LDAP_P(( ++ LDAP *ld, ++ LDAPMessage *res, ++ struct berval *challenge)); ++ + LDAP_END_DECL + #endif /* _LDAP_H */ +Index: trunk/libraries/libldap/ntlm.c +=================================================================== +--- /dev/null ++++ trunk/libraries/libldap/ntlm.c +@@ -0,0 +1,138 @@ ++/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */ ++/* ++ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. ++ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file ++ */ ++ ++/* Mostly copied from sasl.c */ ++ ++#include "portable.h" ++ ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#include "ldap-int.h" ++ ++int ++ldap_ntlm_bind( ++ LDAP *ld, ++ LDAP_CONST char *dn, ++ ber_tag_t tag, ++ struct berval *cred, ++ LDAPControl **sctrls, ++ LDAPControl **cctrls, ++ int *msgidp ) ++{ ++ BerElement *ber; ++ int rc; ++ ber_int_t id; ++ ++ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 ); ++ ++ assert( ld != NULL ); ++ assert( LDAP_VALID( ld ) ); ++ assert( msgidp != NULL ); ++ ++ if( msgidp == NULL ) { ++ ld->ld_errno = LDAP_PARAM_ERROR; ++ return ld->ld_errno; ++ } ++ ++ /* create a message to send */ ++ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) { ++ ld->ld_errno = LDAP_NO_MEMORY; ++ return ld->ld_errno; ++ } ++ ++ assert( LBER_VALID( ber ) ); ++ ++ LDAP_NEXT_MSGID( ld, id ); ++ rc = ber_printf( ber, "{it{istON}" /*}*/, ++ id, LDAP_REQ_BIND, ++ ld->ld_version, dn, tag, ++ cred ); ++ ++ /* Put Server Controls */ ++ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) { ++ ber_free( ber, 1 ); ++ return ld->ld_errno; ++ } ++ ++ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) { ++ ld->ld_errno = LDAP_ENCODING_ERROR; ++ ber_free( ber, 1 ); ++ return ld->ld_errno; ++ } ++ ++ /* send the message */ ++ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id ); ++ ++ if(*msgidp < 0) ++ return ld->ld_errno; ++ ++ return LDAP_SUCCESS; ++} ++ ++int ++ldap_parse_ntlm_bind_result( ++ LDAP *ld, ++ LDAPMessage *res, ++ struct berval *challenge) ++{ ++ ber_int_t errcode; ++ ber_tag_t tag; ++ BerElement *ber; ++ ber_len_t len; ++ ++ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 ); ++ ++ assert( ld != NULL ); ++ assert( LDAP_VALID( ld ) ); ++ assert( res != NULL ); ++ ++ if ( ld == NULL || res == NULL ) { ++ return LDAP_PARAM_ERROR; ++ } ++ ++ if( res->lm_msgtype != LDAP_RES_BIND ) { ++ ld->ld_errno = LDAP_PARAM_ERROR; ++ return ld->ld_errno; ++ } ++ ++ if ( ld->ld_error ) { ++ LDAP_FREE( ld->ld_error ); ++ ld->ld_error = NULL; ++ } ++ if ( ld->ld_matched ) { ++ LDAP_FREE( ld->ld_matched ); ++ ld->ld_matched = NULL; ++ } ++ ++ /* parse results */ ++ ++ ber = ber_dup( res->lm_ber ); ++ ++ if( ber == NULL ) { ++ ld->ld_errno = LDAP_NO_MEMORY; ++ return ld->ld_errno; ++ } ++ ++ tag = ber_scanf( ber, "{ioa" /*}*/, ++ &errcode, challenge, &ld->ld_error ); ++ ber_free( ber, 0 ); ++ ++ if( tag == LBER_ERROR ) { ++ ld->ld_errno = LDAP_DECODING_ERROR; ++ return ld->ld_errno; ++ } ++ ++ ld->ld_errno = errcode; ++ ++ return( ld->ld_errno ); ++} ++ +Index: trunk/libraries/libldap/Makefile.in +=================================================================== +--- trunk.orig/libraries/libldap/Makefile.in ++++ trunk/libraries/libldap/Makefile.in +@@ -27,7 +27,7 @@ + init.c options.c print.c string.c util-int.c schema.c \ + charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ + tls2.c tls_o.c tls_g.c tls_m.c \ +- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ ++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ + assertion.c deref.c ldif.c fetch.c + + OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ +@@ -40,7 +40,7 @@ + init.lo options.lo print.lo string.lo util-int.lo schema.lo \ + charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ + tls2.lo tls_o.lo tls_g.lo tls_m.lo \ +- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ ++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ + assertion.lo deref.lo ldif.lo fetch.lo + + LDAP_INCDIR= ../../include +Index: trunk/libraries/libldap_r/Makefile.in +=================================================================== +--- trunk.orig/libraries/libldap_r/Makefile.in ++++ trunk/libraries/libldap_r/Makefile.in +@@ -29,7 +29,7 @@ + init.c options.c print.c string.c util-int.c schema.c \ + charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ + tls2.c tls_o.c tls_g.c tls_m.c \ +- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ ++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ + assertion.c deref.c ldif.c fetch.c + SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \ + thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \ +@@ -47,7 +47,7 @@ + init.lo options.lo print.lo string.lo util-int.lo schema.lo \ + charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ + tls2.lo tls_o.lo tls_g.lo tls_m.lo \ +- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ ++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ + assertion.lo deref.lo ldif.lo fetch.lo + + LDAP_INCDIR= ../../include diff --git a/testing/openldap/openldap.install b/testing/openldap/openldap.install new file mode 100644 index 000000000..cf3cb9f25 --- /dev/null +++ b/testing/openldap/openldap.install @@ -0,0 +1,20 @@ +post_install(){ + groupadd -g 439 ldap &>/dev/null + useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null + chown -R ldap:ldap var/lib/openldap &>/dev/null +} + +post_upgrade(){ + getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null + getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null + chown -R ldap:ldap var/lib/openldap &>/dev/null +} + +post_remove(){ + if getent passwd ldap >/dev/null 2>&1; then + userdel ldap + fi + if getent group ldap >/dev/null 2>&1; then + groupdel ldap + fi +} diff --git a/testing/openldap/slapd b/testing/openldap/slapd new file mode 100755 index 000000000..4f212da66 --- /dev/null +++ b/testing/openldap/slapd @@ -0,0 +1,49 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd + +PID=`pidof -o %PPID /usr/sbin/slapd` +case "$1" in + start) + stat_busy "Starting OpenLDAP" + [ ! -d /run/openldap ] && install -d -m755 -o ldap -g ldap /run/openldap + if [ -z "$PID" ]; then + if [ -z "$SLAPD_SERVICES" ]; then + /usr/sbin/slapd -u ldap -g ldap $SLAPD_OPTIONS + else + /usr/sbin/slapd -u ldap -g ldap -h "$SLAPD_SERVICES" $SLAPD_OPTIONS + fi + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + add_daemon slapd + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping OpenLDAP" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /run/openldap/slapd.pid + rm -f /run/openldap/slapd.args + rm_daemon slapd + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/openldap/slapd.default b/testing/openldap/slapd.default new file mode 100644 index 000000000..72ae2a6a7 --- /dev/null +++ b/testing/openldap/slapd.default @@ -0,0 +1,6 @@ +# slapd normally serves ldap only on all TCP-ports 389. slapd can also +# service requests on TCP-port 636 (ldaps) and requests via unix +# sockets. +# Example usage: +#SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///" +SLAPD_OPTIONS="" diff --git a/testing/startup-notification/PKGBUILD b/testing/startup-notification/PKGBUILD new file mode 100644 index 000000000..d08515e99 --- /dev/null +++ b/testing/startup-notification/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 160410 2012-06-01 20:06:00Z andyrtr $ +# Maintainer: Jan de Groot +# Contributor: dorphell + +pkgname=startup-notification +pkgver=0.12 +pkgrel=3 +pkgdesc="Monitor and display application startup" +arch=(i686 x86_64) +license=('LGPL') +depends=('libx11' 'xcb-util>=0.3.9') +options=('!libtool') +url="http://www.freedesktop.org" +source=(http://www.freedesktop.org/software/startup-notification/releases/${pkgname}-${pkgver}.tar.gz) +md5sums=('2cd77326d4dcaed9a5a23a1232fb38e9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e '/AC_PATH_XTRA/d' configure.in + autoreconf --force --install + ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/xcb-util-image/LICENSE b/testing/xcb-util-image/LICENSE new file mode 100644 index 000000000..5e3822ccd --- /dev/null +++ b/testing/xcb-util-image/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine + * Copyright (C) 2007-2008 Vincent Torri + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey + * Copyright © 2008 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood + * Copyright © 2008 Jamey Sharp + * Copyright © 2008 Josh Triplett + * Copyright © 2008 Ulrich Eckhardt + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/testing/xcb-util-image/PKGBUILD b/testing/xcb-util-image/PKGBUILD new file mode 100644 index 000000000..42beb6bca --- /dev/null +++ b/testing/xcb-util-image/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 160414 2012-06-01 20:06:05Z andyrtr $ +# Maintainer: Jan de Groot +# Maintainer: Andreas Radke + +pkgname=xcb-util-image +pkgver=0.3.9 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding - Port of Xlib's XImage and XShmImage functions" +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7' 'xcb-util>=0.3.9') +makedepends=('xorg-util-macros') +options=('!libtool') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +sha256sums=('d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df' + 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/xcb-util-keysyms/LICENSE b/testing/xcb-util-keysyms/LICENSE new file mode 100644 index 000000000..5e3822ccd --- /dev/null +++ b/testing/xcb-util-keysyms/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine + * Copyright (C) 2007-2008 Vincent Torri + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey + * Copyright © 2008 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood + * Copyright © 2008 Jamey Sharp + * Copyright © 2008 Josh Triplett + * Copyright © 2008 Ulrich Eckhardt + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/testing/xcb-util-keysyms/PKGBUILD b/testing/xcb-util-keysyms/PKGBUILD new file mode 100644 index 000000000..108cd969b --- /dev/null +++ b/testing/xcb-util-keysyms/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 160416 2012-06-01 20:06:07Z andyrtr $ +# Maintainer: Jan de Groot +# Maintainer: Andreas Radke + +pkgname=xcb-util-keysyms +pkgver=0.3.9 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding - Standard X key constants and conversion to/from keycodes" +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7') +makedepends=('xorg-util-macros') +options=('!libtool') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +sha256sums=('7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e' + 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/xcb-util-wm/LICENSE b/testing/xcb-util-wm/LICENSE new file mode 100644 index 000000000..5e3822ccd --- /dev/null +++ b/testing/xcb-util-wm/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine + * Copyright (C) 2007-2008 Vincent Torri + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey + * Copyright © 2008 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood + * Copyright © 2008 Jamey Sharp + * Copyright © 2008 Josh Triplett + * Copyright © 2008 Ulrich Eckhardt + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/testing/xcb-util-wm/PKGBUILD b/testing/xcb-util-wm/PKGBUILD new file mode 100644 index 000000000..27c09f2b5 --- /dev/null +++ b/testing/xcb-util-wm/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 160418 2012-06-01 20:06:11Z andyrtr $ +# Maintainer: Jan de Groot +# Maintainer: Andreas Radke + +pkgname=xcb-util-wm +pkgver=0.3.9 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM" +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7') +makedepends=('xorg-util-macros') +options=('!libtool') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +sha256sums=('038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030' + 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/xcb-util/LICENSE b/testing/xcb-util/LICENSE new file mode 100644 index 000000000..5e3822ccd --- /dev/null +++ b/testing/xcb-util/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine + * Copyright (C) 2007-2008 Vincent Torri + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey + * Copyright © 2008 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood + * Copyright © 2008 Jamey Sharp + * Copyright © 2008 Josh Triplett + * Copyright © 2008 Ulrich Eckhardt + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/testing/xcb-util/PKGBUILD b/testing/xcb-util/PKGBUILD new file mode 100644 index 000000000..fc8f7146d --- /dev/null +++ b/testing/xcb-util/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 160412 2012-06-01 20:06:02Z andyrtr $ +# Maintainer: Jan de Groot +# Maintainer: Andreas Radke +# Contributor: Andrea Scarpino + +pkgname=xcb-util +pkgver=0.3.9 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding" +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7') +makedepends=('gperf' 'xorg-util-macros') +options=('!libtool') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +sha256sums=('c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4' + 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/xf86-video-intel/PKGBUILD b/testing/xf86-video-intel/PKGBUILD index d4a3cea8b..eab794d2a 100644 --- a/testing/xf86-video-intel/PKGBUILD +++ b/testing/xf86-video-intel/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 159992 2012-05-27 13:11:20Z dreisner $ +# $Id: PKGBUILD 160420 2012-06-01 20:06:14Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-intel pkgver=2.19.0 -pkgrel=2 +pkgrel=3 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') -depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.8' 'libxfixes' 'udev>=183') +depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'udev>=183') makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') conflicts=('xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy') options=('!libtool') -- cgit v1.2.3-54-g00ecf