Permalink
Browse files

FL-575: workrave, fix missing libXScrnSaver dep

  • Loading branch information...
1 parent 13eb7ee commit 6089e96a8e140af02f280c56a6dd2abb323e1298 @angryvincent angryvincent committed Jun 10, 2013
@@ -0,0 +1,2 @@
+DIST workrave-1.10.tar.gz 6800389 SHA256 b6733907ed0f2d42f234a0ce4f000b03329c1c50b3028defcb892e6b3a4541ba SHA512 3a73d0fe8ba85dd6396666f6ea00e7a2992038d1eba06d97741ffc7ad43afef5528995fee24d9f306d8c207ef924d677c8a3223ac83f68126284d8a02c328506 WHIRLPOOL c53632b4ef7f014c4bb8783450b5f076f96a19eb0b26a96258574d3809a58e827424a140abba1a7a5ef300a9363dd43f64e256456746b577920a0542d8eafea4
+DIST workrave-1.9.4.tar.gz 6748495 SHA256 ce1efa57a37192029c4dcbe8a0ac2b893b2286c42828f19b0fb86867cbbcde1a SHA512 6c55de143bdad1435a1af9beaefd15a607bb5b54f99aaf52f1d691e2206b642c8c340ac222a44ea4fabb866e8e6cff32b086bf441551fb9357c925bc0021dd4a WHIRLPOOL 67487b493e48b62dddd306b19e6231b480910221f8c18e44ab13094971f6496920b109d62afc0607efa28f6a79ad7ba798bc6dde6c14bb9a02c986872aea859e
@@ -0,0 +1,25 @@
+Description: get_action_area() now returns ButtonBox* instead of
+ HButtonBox*, change type of constructor argument to reflect this.
+Author: Ilya Barygin <barygin@gmail.com>
+--- workrave-1.9.1.orig/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh
++++ workrave-1.9.1/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh
+@@ -43,7 +43,7 @@
+ class ExercisesPanel : public Gtk::HBox
+ {
+ public:
+- ExercisesPanel(Gtk::HButtonBox *dialog_action_area);
++ ExercisesPanel(Gtk::ButtonBox *dialog_action_area);
+ ~ExercisesPanel();
+
+ void set_exercise_count(int num);
+--- workrave-1.9.1.orig/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc
++++ workrave-1.9.1/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc
+@@ -210,7 +210,7 @@ text_buffer_set_markup (GtkTextBuffer *b
+
+ int ExercisesPanel::exercises_pointer = 0;
+
+-ExercisesPanel::ExercisesPanel(Gtk::HButtonBox *dialog_action_area)
++ExercisesPanel::ExercisesPanel(Gtk::ButtonBox *dialog_action_area)
+ : Gtk::HBox(false, 6),
+ exercises(Exercise::get_exercises())
+ {
@@ -0,0 +1,27 @@
+--- frontend/common/src/SoundPlayer.cc.orig 2010-06-16 10:49:11.000000000 +0200
++++ frontend/common/src/SoundPlayer.cc 2010-06-16 10:54:04.000000000 +0200
+@@ -334,8 +334,11 @@
+ void
+ SoundPlayer::init()
+ {
+- driver->init();
+- register_sound_events();
++ if (driver != NULL)
++ {
++ driver->init();
++ register_sound_events();
++ }
+ }
+
+ void
+@@ -405,6 +408,10 @@
+ void
+ SoundPlayer::sync_settings()
+ {
++ if (driver == NULL)
++ {
++ return;
++ }
+ if (driver != NULL)
+ {
+ for (unsigned int i = 0; i < sizeof(sound_registry)/sizeof(sound_registry[0]); i++)
@@ -0,0 +1,67 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
+HOMEPAGE="http://www.workrave.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbus doc distribution gstreamer nls pulseaudio test"
+
+RDEPEND=">=dev-libs/glib-2.28.0:2
+ >=x11-libs/gtk+-3.0:3
+ >=dev-cpp/gtkmm-3.0.0:3.0
+ >=dev-cpp/glibmm-2.28.0:2
+ >=dev-libs/libsigc++-2.2.4.2:2
+ >=gnome-base/gnome-shell-3.6.2
+ dbus? (
+ >=sys-apps/dbus-1.2
+ dev-libs/dbus-glib )
+ distribution? ( >=net-libs/gnet-2 )
+ gstreamer? (
+ >=media-libs/gstreamer-0.10:0.10
+ >=media-libs/gst-plugins-base-0.10:0.10 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXtst
+ x11-libs/libXt
+ x11-libs/libXmu
+ x11-libs/libXScrnSaver"
+
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40.0
+ x11-proto/xproto
+ x11-proto/inputproto
+ x11-proto/recordproto
+ dev-python/cheetah
+ virtual/pkgconfig
+ doc? (
+ app-text/docbook-sgml-utils
+ app-text/xmlto )
+ nls? ( >=sys-devel/gettext-0.17 )"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-experimental \
+ --disable-static \
+ --disable-xml \
+ $(use_enable dbus) \
+ $(use_enable doc manual) \
+ $(use_enable distribution) \
+ $(use_enable gstreamer) \
+ $(use_enable nls) \
+ $(use_enable pulseaudio pulse) \
+ $(use_enable test tests)
+}
@@ -0,0 +1,75 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+GCONF_DEBUG="yes"
+PYTHON_DEPEND="2:2.5"
+
+inherit eutils gnome2 python
+
+DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
+HOMEPAGE="http://www.workrave.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="*"
+IUSE="dbus doc distribution gnome gstreamer nls pulseaudio test"
+
+RDEPEND=">=dev-libs/glib-2.10:2
+ >=gnome-base/gconf-2
+ >=x11-libs/gtk+-2.8:2
+ >=dev-cpp/gtkmm-2.10:2.4
+ >=dev-cpp/glibmm-2.10:2
+ >=dev-libs/libsigc++-2:2
+ dbus? (
+ >=sys-apps/dbus-1.2
+ dev-libs/dbus-glib )
+ distribution? ( >=net-libs/gnet-2 )
+ gnome? (
+ || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
+ >=gnome-base/libbonobo-2
+ >=gnome-base/orbit-2.8.3 )
+ gstreamer? (
+ >=media-libs/gstreamer-0.10:0.10
+ >=media-libs/gst-plugins-base-0.10:0.10 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXtst
+ x11-libs/libXt
+ x11-libs/libXmu
+ x11-libs/libXScrnSaver"
+
+DEPEND="${RDEPEND}
+ x11-proto/xproto
+ x11-proto/inputproto
+ x11-proto/recordproto
+ dev-python/cheetah
+ virtual/pkgconfig
+ doc? (
+ app-text/docbook-sgml-utils
+ app-text/xmlto )
+ nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+ DOCS="AUTHORS NEWS README TODO"
+ G2CONF="${G2CONF}
+ --without-arts
+ --disable-kde
+ --enable-gconf
+ --disable-x11-monitoring-fallback
+ --disable-gnome3
+ --disable-experimental
+ --disable-xml
+ $(use_enable dbus)
+ $(use_enable doc manual)
+ $(use_enable distribution)
+ $(use_enable gnome)
+ $(use_enable gstreamer)
+ $(use_enable nls)
+ $(use_enable pulseaudio pulse)
+ $(use_enable test tests)"
+
+ python_set_active_version 2
+ python_pkg_setup
+}

0 comments on commit 6089e96

Please sign in to comment.