From e991cb9261695075cb9db6a656f1051469c68ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Mon, 3 Aug 2015 11:32:15 +0300 Subject: [PATCH] fix deps plasma-desktop, plasma-workspace --- desktop/kde/plasma/plasma-desktop/pspec.xml | 10 +- .../plasma/plasma-workspace/files/kde-env.sh | 19 ++ desktop/kde/plasma/plasma-workspace/pspec.xml | 14 +- multimedia/sound/libcanberra/actions.py | 38 ++++ .../sound/libcanberra/files/fix-pthread.patch | 13 ++ .../libcanberra/files/fix-underlinking.patch | 22 +++ multimedia/sound/libcanberra/pspec.xml | 182 ++++++++++++++++++ multimedia/sound/libcanberra/translations.xml | 18 ++ x11/driver/xorg-video-cirrus/actions.py | 2 +- x11/driver/xorg-video-v4l/actions.py | 2 +- 10 files changed, 312 insertions(+), 8 deletions(-) create mode 100644 desktop/kde/plasma/plasma-workspace/files/kde-env.sh create mode 100644 multimedia/sound/libcanberra/actions.py create mode 100644 multimedia/sound/libcanberra/files/fix-pthread.patch create mode 100644 multimedia/sound/libcanberra/files/fix-underlinking.patch create mode 100644 multimedia/sound/libcanberra/pspec.xml create mode 100644 multimedia/sound/libcanberra/translations.xml diff --git a/desktop/kde/plasma/plasma-desktop/pspec.xml b/desktop/kde/plasma/plasma-desktop/pspec.xml index 973a68fdd8..e463b9e1bc 100755 --- a/desktop/kde/plasma/plasma-desktop/pspec.xml +++ b/desktop/kde/plasma/plasma-desktop/pspec.xml @@ -42,6 +42,9 @@ fontconfig-devel plasma-workspace-devel system-settings-devel + xorg-app-devel + libcanberra-devel + docbook-xsl qt5-sql-sqlite qt5-sql-mysql @@ -102,6 +105,8 @@ libxkbfile plasma-framework plasma-workspace + libcanberra + pulseaudio-libs qt5-base qt5-declarative qt5-phonon @@ -109,8 +114,11 @@ qt5-x11extras solid sonnet + qt5-sql-sqlite system-settings xcb-util-image + oxygen-icons + oxygen-fonts /etc @@ -126,7 +134,7 @@ - 2015-07-02 + 2015-08-03 5.3.2 Version bump. Stefan Gronewold(groni) diff --git a/desktop/kde/plasma/plasma-workspace/files/kde-env.sh b/desktop/kde/plasma/plasma-workspace/files/kde-env.sh new file mode 100644 index 0000000000..decaa54091 --- /dev/null +++ b/desktop/kde/plasma/plasma-workspace/files/kde-env.sh @@ -0,0 +1,19 @@ +export KF5=/usr +export QTDIR=/usr/lib/qt5 +export XDG_DATA_DIRS=$KF5/share:$XDG_DATA_DIRS:/usr/share +export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/xdg +export PATH=$KF5/bin:$QTDIR/bin:$PATH +export QT_PLUGIN_PATH=$QTDIR/plugins:$QT_PLUGIN_PATH +export QML2_IMPORT_PATH=/usr/lib/qt5/qml:/usr/lib/qt5/qmldir +export QML_IMPORT_PATH=$QML2_IMPORT_PATH +export KDE_SESSION_VERSION=5 +export KDE_FULL_SESSION=true +#separete +export XDG_DATA_HOME=$HOME/.local5/share +export XDG_CONFIG_HOME=$HOME/.config5 +export XDG_CACHE_HOME=$HOME/.cache5 +export XDG_RUNTIME_DIR=/tmp/runtime-$USER +#build +export CMAKE_PREFIX_PATH=$KF5:$CMAKE_PREFIX_PATH +#debug +export QT_MESSAGE_PATTERN='%{appname}(%{pid})/%{category} %{function}: %{message}' diff --git a/desktop/kde/plasma/plasma-workspace/pspec.xml b/desktop/kde/plasma/plasma-workspace/pspec.xml index 63f0f22f59..a74b882f21 100755 --- a/desktop/kde/plasma/plasma-workspace/pspec.xml +++ b/desktop/kde/plasma/plasma-workspace/pspec.xml @@ -53,6 +53,7 @@ pam-devel qt5-base-devel + xorg-app-devel qt5-sql-mysql qt5-sql-odbc qt5-sql-postgresql @@ -138,10 +139,12 @@ wayland-client wayland-server xcb-util-keysyms + xorg-app zlib /etc/pam.d + /etc/env.d /etc/xdg /usr/share /usr/share/applications @@ -151,7 +154,11 @@ /usr/lib/qt5/qml /usr/lib /usr/share/doc - + + + kde.pam + kde-env.sh + @@ -231,9 +238,6 @@ /usr/lib/cmake /usr/lib/pkgconfig - - kde.pam - @@ -251,7 +255,7 @@ - 2015-07-02 + 2015-08-03 5.3.2 Version bump. Stefan Gronewold(groni) diff --git a/multimedia/sound/libcanberra/actions.py b/multimedia/sound/libcanberra/actions.py new file mode 100644 index 0000000000..f7fb389dbe --- /dev/null +++ b/multimedia/sound/libcanberra/actions.py @@ -0,0 +1,38 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import shelltools +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +def setup(): + autotools.autoreconf("-fi") + autotools.configure("--disable-oss \ + --disable-lynx \ + --disable-gtk-doc \ + --disable-schemas-install \ + --enable-gstreamer \ + --enable-gtk3 \ + --enable-pulse \ + --enable-alsa \ + --enable-null \ + --enable-tdb \ + --with-builtin=dso \ + --disable-static") + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall('DESTDIR="%s"' % get.installDIR()) + + #pisitools.remove("/usr/lib/gtk-3.0/modules/libcanberra-gtk-module.so") + pisitools.removeDir("/usr/share/gtk-doc") + + pisitools.dodoc("LGPL", "README") diff --git a/multimedia/sound/libcanberra/files/fix-pthread.patch b/multimedia/sound/libcanberra/files/fix-pthread.patch new file mode 100644 index 0000000000..504bcea548 --- /dev/null +++ b/multimedia/sound/libcanberra/files/fix-pthread.patch @@ -0,0 +1,13 @@ +Index: libcanberra-0.12/acinclude.m4 +=================================================================== +--- libcanberra-0.12.orig/acinclude.m4 ++++ libcanberra-0.12/acinclude.m4 +@@ -112,7 +112,7 @@ acx_pthread_flags="pthreads none -Kthrea + # pthread-config: use pthread-config program (for GNU Pth library) + + case "${host_cpu}-${host_os}" in +- *solaris*) ++ *solaris*|*linux*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based diff --git a/multimedia/sound/libcanberra/files/fix-underlinking.patch b/multimedia/sound/libcanberra/files/fix-underlinking.patch new file mode 100644 index 0000000000..0680b71309 --- /dev/null +++ b/multimedia/sound/libcanberra/files/fix-underlinking.patch @@ -0,0 +1,22 @@ +Index: libcanberra-0.12/src/Makefile.am +=================================================================== +--- libcanberra-0.12.orig/src/Makefile.am ++++ libcanberra-0.12/src/Makefile.am +@@ -58,7 +58,8 @@ libcanberra_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(VORBIS_CFLAGS) + libcanberra_la_LIBADD = \ +- $(VORBIS_LIBS) ++ $(VORBIS_LIBS) \ ++ $(PTHREAD_LIBS) + libcanberra_la_LDFLAGS = \ + -export-dynamic \ + -version-info $(LIBCANBERRA_VERSION_INFO) +@@ -290,6 +291,7 @@ libcanberra_gtk_la_CFLAGS = \ + $(GTK_CFLAGS) + libcanberra_gtk_la_LIBADD = \ + $(GTK_LIBS) \ ++ -lX11 \ + libcanberra.la + libcanberra_gtk_la_LDFLAGS = \ + -export-dynamic -version-info $(LIBCANBERRA_GTK_VERSION_INFO) diff --git a/multimedia/sound/libcanberra/pspec.xml b/multimedia/sound/libcanberra/pspec.xml new file mode 100644 index 0000000000..f40fb80151 --- /dev/null +++ b/multimedia/sound/libcanberra/pspec.xml @@ -0,0 +1,182 @@ + + + + + libcanberra + http://0pointer.de/lennart/projects/libcanberra/ + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + library + app:console + A library for generating event sounds on free desktops + libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops, such as GNOME. It comes with several backends (ALSA, PulseAudio, OSS, GStreamer, null) and is designed to be portable. + http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz + + libogg-devel + pulseaudio-libs-devel + gstreamer-devel + libvorbis-devel + alsa-lib-devel + + glib2-devel + gtk2-devel + gtk3-devel + at-spi2-core-devel + eudev-devel + atk-devel + cairo-devel + pango-devel + libogg-devel + libtdb-devel + libvorbis-devel + fontconfig-devel + gstreamer-next-devel + + + fix-pthread.patch + fix-underlinking.patch + + + + + libcanberra + + libtdb + libtool-ltdl + glib2 + alsa-lib + libvorbis + pulseaudio-libs + gstreamer-next + + + /usr/lib + /usr/share/doc + /usr/share/gdm + /usr/share/gnome/ + + + + + libcanberra-devel + Development files for libcanberra + + libcanberra + + + /usr/include + /usr/share/vala + /usr/lib/pkgconfig + + + + + libcanberra-gtk + GTK+ convenience API and utilities for libcanberra + + libcanberra + gtk2 + glib2 + libX11 + + + /usr/lib/gtk-2* + /usr/lib/libcanberra-gtk.so* + + + + + libcanberra-gtk-devel + Development files for libcanberra-gtk + + libcanberra + libcanberra-devel + gtk2-devel + + + /usr/include/canberra-gtk.h + /usr/lib/pkgconfig/libcanberra-gtk.pc + /usr/share/vala/vapi/libcanberra-gtk.vapi + + + + + libcanberra-gtk3-devel + Development files for libcanberra-gtk + + libcanberra-gtk-devel + gtk3-devel + + + /usr/lib/pkgconfig/libcanberra-gtk3.pc + + + + + + libcanberra-gtk3 + GTK+ convenience API and utilities for libcanberra + + gtk3 + glib2 + eudev + libX11 + libcanberra + + + /usr/lib/gtk-3* + /usr/lib/libcanberra-gtk3* + /usr/share/doc/libcanberra-gtk3 + /usr/bin/canberra-boot + /usr/bin/canberra-gtk-play + + + + + + 2015-08-03 + 0.30 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2013-11-15 + 0.30 + Version bump + Richard de Bruin + richdb@pisilinux.org + + + 2013-10-07 + 0.29 + Split Package + Fixed. + PisiLinux Community + admins@pisilinux.org + + + 2013-08-17 + 0.29 + Release Bump. + PisiLinux Community + admins@pisilinux.org + + + 2013-07-29 + 0.29 + missing dep. + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2012-08-31 + 0.29 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/multimedia/sound/libcanberra/translations.xml b/multimedia/sound/libcanberra/translations.xml new file mode 100644 index 0000000000..44dbca8206 --- /dev/null +++ b/multimedia/sound/libcanberra/translations.xml @@ -0,0 +1,18 @@ + + + + libcanberra + Masaüstü üzerinde bildirim sesleri üretmek için kütüphane + libcanberra, çeşitli arka uç (ALSA, PulseAudio, GStreamer, null) destekleri olan, XDG Ses Teması ve İsimlendirme standartlarına uygun, bildirim sesi çalma kütüphanesidir. + + + + libcanberra-gtk + GTK+ için libcanberra araçları ve programlama kitaplığı + + + + libcanberra-devel + libcanberra için geliştirme dosyaları + + \ No newline at end of file diff --git a/x11/driver/xorg-video-cirrus/actions.py b/x11/driver/xorg-video-cirrus/actions.py index 7fb463ec9f..588d5ce0e3 100644 --- a/x11/driver/xorg-video-cirrus/actions.py +++ b/x11/driver/xorg-video-cirrus/actions.py @@ -9,7 +9,7 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools def setup(): - autotools.autoreconf("-fiv") + #autotools.autoreconf("-fiv") autotools.configure("--disable-static") def build(): diff --git a/x11/driver/xorg-video-v4l/actions.py b/x11/driver/xorg-video-v4l/actions.py index 8bb03e06f7..8cf84bf1b2 100644 --- a/x11/driver/xorg-video-v4l/actions.py +++ b/x11/driver/xorg-video-v4l/actions.py @@ -8,7 +8,7 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools def setup(): - autotools.autoreconf("-vif") + #autotools.autoreconf("-vif") autotools.configure("--disable-static") def build():