[gentoo-commits] gentoo-x86 commit in app-misc/workrave/files: workrave-1.9.0-dbus-glib.xml workrave-1.9.0-service.in workrave-1.9.0-gcc43.patch workrave-1.9.0-gui.xml workrave-1.9.0-compilation-fixes.patch workrave-1.9.0-parallel-make.patch

[Gilles Dartiguelongue (eva)]

eva         08/11/22 14:50:49

  Added:                workrave-1.9.0-dbus-glib.xml
                        workrave-1.9.0-service.in
                        workrave-1.9.0-gcc43.patch workrave-1.9.0-gui.xml
                        workrave-1.9.0-compilation-fixes.patch
                        workrave-1.9.0-parallel-make.patch
  Log:
  Bump to 1.9.0. Gstreamer support is not enabled because it freezes workrave on my box. Closes bug #236270.
  (Portage version: 2.2_rc15/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

Revision  Changes    Path
1.1                  app-misc/workrave/files/workrave-1.9.0-dbus-glib.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-dbus-glib.xml?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-dbus-glib.xml?rev=1.1&content-type=text/plain

Index: workrave-1.9.0-dbus-glib.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>

<node name="/org/workrave/Workrave">

#for interface in $model.interfaces
  <interface name="$interface.name">

#for method in $interface.methods
    <method name="$method.qname">
      <annotation name="org.freedesktop.DBus.GLib.CSymbol" 
                  value="$method.csymbol"/>
     #for p in method.params
     <arg type="$p.sig()" name="$p.name" direction="$p.direction" />
     #end for
    </method>
#end for
  
  </interface>

#end for

</node>

  



1.1                  app-misc/workrave/files/workrave-1.9.0-service.in

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-service.in?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-service.in?rev=1.1&content-type=text/plain

Index: workrave-1.9.0-service.in
===================================================================
[D-BUS Service]
Name=org.workrave.Workrave.Activator
Exec=@workravebindir@/workrave



1.1                  app-misc/workrave/files/workrave-1.9.0-gcc43.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-gcc43.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-gcc43.patch?rev=1.1&content-type=text/plain

Index: workrave-1.9.0-gcc43.patch
===================================================================
Index: frontend/gtkmm/src/GnomeAppletWindow.cc
===================================================================
--- frontend/gtkmm/src/GnomeAppletWindow.cc	(révision 1650)
+++ frontend/gtkmm/src/GnomeAppletWindow.cc	(copie de travail)
@@ -19,6 +19,8 @@
 
 static const char rcsid[] = "$Id: workrave-1.9.0-gcc43.patch,v 1.1 2008/11/22 14:50:49 eva Exp $";
 
+using namespace std;
+
 #include "preinclude.h"
 
 #ifdef HAVE_CONFIG_H
@@ -111,10 +113,14 @@
               applet_orientation =  (Orientation) applet_control->GetOrientation();
 
 #ifndef HAVE_EXERCISES
-              applet_control->SetMenuActive("/commands/Exercises", false);
+              const std::string exercices_command("/commands/Exercises");
+	      bool exercices_command_status(false);
+              applet_control->SetMenuActive(exercices_command, exercices_command_status);
 #endif
 #ifndef HAVE_DISTRIBUTION
-              applet_control->SetMenuActive("/commands/Network", false);
+              const std::string network_command("/commands/Network");
+	      bool network_command_status(false);
+              applet_control->SetMenuActive(network_command, network_command_status);
 #endif
             }
         }



1.1                  app-misc/workrave/files/workrave-1.9.0-gui.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-gui.xml?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-gui.xml?rev=1.1&content-type=text/plain

Index: workrave-1.9.0-gui.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>

<unit name="DBusGUI">

  <interface name="org.workrave.ControlInterface" csymbol="Menus">
    <import>
      <include name="Menus.hh"/>
    </import>

    <method name="OpenMain"              csymbol="on_menu_open_main_window"/>
    <method name="Preferences"           csymbol="on_menu_preferences"/>
    <method name="NetworkConnect"        csymbol="on_menu_network_join"/>
    <method name="NetworkLog"            csymbol="on_menu_network_log">
      <arg type="bool" name="show" direction="in"/>
    </method>
    <method name="NetworkReconnect"      csymbol="on_menu_network_reconnect"/>
    <method name="NetworkDisconnect"     csymbol="on_menu_network_leave"/>
    <method name="Statistics"            csymbol="on_menu_statistics"/>
    <method name="Exercises"             csymbol="on_menu_exercises"
 	                                 condition="defined(HAVE_EXERCISES)"/>
    <method name="RestBreak"             csymbol="on_menu_restbreak_now"/>
    <method name="Quit"                  csymbol="on_menu_quit"/>
    <method name="About"                 csymbol="on_menu_about"/>
  </interface>

  <interface name="org.workrave.GnomeAppletSupportInterface" csymbol="GnomeAppletWindow"
             condition="defined(HAVE_GNOME)">
    <import>
      <include name="gdk/gdkcolor.h"/>
      <include name="GnomeAppletWindow.hh"/>
      <include name="Orientation.hh"/>
    </import>

    <struct name="Color" csymbol="GdkColor">
      <field type="uint32" name="pixel"/>
      <field type="uint32" name="red"/>
      <field type="uint32" name="green"/>
      <field type="uint32" name="blue"/>
    </struct>

    <enum name="Orientation" csymbol="Orientation">
      <value name="up"    csymbol="ORIENTATION_UP"/>
      <value name="right" csymbol="ORIENTATION_RIGHT"/>
      <value name="down"  csymbol="ORIENTATION_DOWN"/>
      <value name="left"  csymbol="ORIENTATION_LEFT"/>
    </enum>

    <method name="SetOrientation" csymbol="set_applet_orientation">
      <arg type="Orientation" name="orientation" direction="in"/>
    </method>
      
    <method name="SetSize" csymbol="set_applet_size">
      <arg type="uint32" name="size" direction="in"/>
    </method>
      
    <method name="SetBackground" csymbol="set_applet_background">
      <arg type="uint32" name="type" direction="in"/>
      <arg type="Color" name="color" direction="in"/>
      <arg type="uint32" name="xid" direction="in"/>
    </method>

    <method name="ButtonClicked" csymbol="button_clicked">
      <arg type="uint32" name="button" direction="in"/>
    </method>

    <method name="EmbedRequest" csymbol="fire_gnome_applet"/>
  </interface>
</unit>



1.1                  app-misc/workrave/files/workrave-1.9.0-compilation-fixes.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-compilation-fixes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-compilation-fixes.patch?rev=1.1&content-type=text/plain

Index: workrave-1.9.0-compilation-fixes.patch
===================================================================
Index: frontend/gtkmm/src/Menus.cc
===================================================================
--- frontend/gtkmm/src/Menus.cc	(révision 1650)
+++ frontend/gtkmm/src/Menus.cc	(copie de travail)
@@ -461,7 +461,7 @@
 #endif
 }
 
-
+#ifdef HAVE_DISTRIBUTION
 void
 Menus::on_network_log_response(int response)
 {
@@ -476,6 +476,7 @@
   // done by gtkmm ??? delete network_log_dialog;
   network_log_dialog = NULL;
 }
+#endif
 
 void
 Menus::on_statistics_response(int response)
@@ -534,7 +535,11 @@
       on_menu_network_leave();
       break;
     case MENU_COMMAND_NETWORK_LOG:
+#ifdef HAVE_DISTRIBUTION
       on_menu_network_log(network_log_dialog == NULL);
+#else
+      on_menu_network_log(true);
+#endif
       break;
     case MENU_COMMAND_NETWORK_RECONNECT:
       on_menu_network_reconnect();
@@ -565,7 +570,12 @@
           ICore *core = CoreFactory::get_core();
 
           menus[i]->resync(core->get_operation_mode(),
+#ifdef HAVE_DISTRIBUTION
                            network_log_dialog != NULL);
+#else
+                           false);
+#endif
+
         }
     }
 



1.1                  app-misc/workrave/files/workrave-1.9.0-parallel-make.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-parallel-make.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/workrave/files/workrave-1.9.0-parallel-make.patch?rev=1.1&content-type=text/plain

Index: workrave-1.9.0-parallel-make.patch
===================================================================
Index: frontend/gtkmm/src/Makefile.am
===================================================================
--- frontend/gtkmm/src/Makefile.am	(révision 1650)
+++ frontend/gtkmm/src/Makefile.am	(copie de travail)
@@ -119,7 +119,7 @@
 
 includesinput = 	-I$(top_srcdir)/common/win32/harpoon/include
 WIN32LIBS = 		-L$(top_builddir)/common/win32/harpoon/src/Release/ -lharpoon \
-			${top_srcdir}/frontend/gtkmm/src/win32/libworkrave-frontend-gtkmm-win32.la \
+			$(top_builddir)/frontend/gtkmm/src/win32/libworkrave-frontend-gtkmm-win32.la \
 			-lshell32 -lole32 -lwinmm -lshlwapi
 endif
 
@@ -130,7 +130,7 @@
 if PLATFORM_OS_OSX
 includesosx  = 		-I$(top_srcdir)/frontend/gtkmm/src/osx
 ldflags =	 	-L$(top_builddir)/frontend/gtkmm/src/osx
-OSXLIBS	=		${top_srcdir}/frontend/gtkmm/src/osx/libworkrave-frontend-gtkmm-osx.la
+OSXLIBS	=		$(top_builddir)/frontend/gtkmm/src/osx/libworkrave-frontend-gtkmm-osx.la
 extrasources +=		
 endif
 
@@ -277,9 +277,9 @@
 
 endif
 
-$(bin_PROGRAMS):	${top_srcdir}/backend/src/libworkrave-backend.la \
-			${top_srcdir}/common/src/libworkrave-common.la \
-			${top_srcdir}/frontend/common/src/libworkrave-frontend-common.la
+$(bin_PROGRAMS):	$(top_builddir)/backend/src/libworkrave-backend.la \
+			$(top_builddir)/common/src/libworkrave-common.la \
+			$(top_builddir)/frontend/common/src/libworkrave-frontend-common.la
 
 workrave_LDFLAGS = 	@WR_LDFLAGS@ ${ldflags}