[100208] trunk/dports/gnome/gpodder

3 Dec 2012

Revision: 100208
          https://trac.macports.org/changeset/100208
Author:   elelay@macports.org
Date:     2012-12-03 12:06:02 -0800 (Mon, 03 Dec 2012)
Log Message:
-----------
apply #36972 : update to gPodder 3.3.0

Modified Paths:
--------------
    trunk/dports/gnome/gpodder/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gpodder/files/adjust-modifiers.xsl

Removed Paths:
-------------
    trunk/dports/gnome/gpodder/files/patch-src-gpodder-gui-py.diff

Modified: trunk/dports/gnome/gpodder/Portfile
===================================================================

--- trunk/dports/gnome/gpodder/Portfile	2012-12-03 20:01:55 UTC (rev 100207)
+++ trunk/dports/gnome/gpodder/Portfile	2012-12-03 20:06:02 UTC (rev 100208)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                gpodder
-version             2.20
+version             3.3.0
 revision            1
 categories          gnome audio
 license             GPL-3
@@ -20,9 +20,9 @@
 homepage            http://gpodder.org
 master_sites        http://gpodder.org/src/
 
-checksums           md5     4c09c1e2c3a3c291b5d1e9d185b59655 \
-                    sha1    21ae1255c63b69a8da2114d752ded07094097a8e \
-                    rmd160  d9553e196d462d4210f46deebda41ccce68ff7a3
+checksums           md5     8bc40207b74621b8ee97051d6890918d \
+                    sha1    e48136d5d19b4c4d2e52d54d7a805655481dff4e \
+                    rmd160  1f861217036c6565b87689c45051bb1f7d85f153
 
 
 depends_build       port:help2man\
@@ -92,7 +92,7 @@
     # Install the 2.7 apps in the standard path :
     # the 2 variants can't be active simultaneously.
     post-destroot {
-        foreach {app} {gpodder gpo gpodder-backup} {
+        foreach {app} {gpodder gpo gpodder-backup gpodder-migrate2tres} {
             ln -s ${my_python}/bin/${app} ${destroot}${prefix}/bin/${app}
         }
     }
@@ -104,6 +104,12 @@
 
 variant quartz {
     depends_lib-append  port:gtk-osx-application
+    
+    post-destroot {
+    	# Command-XX shortcuts in gPodder menus
+    	system "/usr/bin/xsltproc -o ${destroot}${my_python}/share/gpodder/ui/gtk/gpodder.ui \
+    		${filespath}/adjust-modifiers.xsl ${worksrcpath}/share/gpodder/ui/gtk/gpodder.ui"
+    }
 }
 
 variant html_notes description {Use WebkitGtk+ to show episode notes in HTML format} {
@@ -129,16 +135,29 @@
 		set install_path "${prefix}"
 	}
 
-	system "cd ${worksrcpath}/data/osx && make \
+	system "cd ${worksrcpath}/tools/mac-osx && make \
 		GPODDERSCRIPT=\"${install_path}/bin/gpodder\"\
 		APPLICATIONSDIR=\"${destroot}${applications_dir}\"\
 		VERSION=\"${version}\"\
 		OSXVERSION=\"${os.platform}${os.major}\" all"
 }
 
-# compatibility with gtk-osx-application >= 1.0.1
-patchfiles-append   patch-src-gpodder-gui-py.diff
+post-activate {
+        ui_msg "
 
+****
+****    With release 3.0, gPodder file structure has changed: instead of storing
+**** the database in \$HOME/.config/gpodder and the downloads in \$HOME/gpodder-downloads
+**** everything is now stored in the \$HOME/gPodder directory.
+****    The database structure has also changed, so you'll have to run this
+**** command to convert to the new format.
+****
+**** ${prefix}/bin/gpodder-migrate2tres
+**** 
+"
+}
+
+
 livecheck.type      regex
 livecheck.url       ${master_sites}
 livecheck.regex     "gpodder-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Added: trunk/dports/gnome/gpodder/files/adjust-modifiers.xsl
===================================================================
--- trunk/dports/gnome/gpodder/files/adjust-modifiers.xsl	                        (rev 0)
+++ trunk/dports/gnome/gpodder/files/adjust-modifiers.xsl	2012-12-03 20:06:02 UTC (rev 100208)
@@ -0,0 +1,35 @@
+<?xml version="1.0" ?>
+<!-- this stylesheet ajusts menu item accelerators:
+     - Control-XX to Command-XX
+     - Command-, for preferences
+     - Command-? for user manual
+     
+     accelerators names are found in gtk/source/gtk+/gdk/gdkkeysyms-compat.h
+  -->
+<xsl:stylesheet 
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	version="1.0">
+
+	<xsl:template match="@*|node()">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="@modifiers[. = 'GDK_CONTROL_MASK']">
+		<xsl:attribute name="modifiers">GDK_META_MASK</xsl:attribute>
+	</xsl:template>
+	
+	<xsl:template match="accelerator[preceding-sibling::*[1][property[@name = 'stock_id' and . = 'gtk-preferences']]]">
+          <accelerator key="comma" modifiers="GDK_META_MASK"/>
+	</xsl:template>
+	
+	<xsl:template match="object[property[@name='stock_id' and . ='gtk-help']]">
+	  <xsl:copy>
+	  	<xsl:apply-templates select="@*|node()"/>
+	  </xsl:copy>
+          <accelerator key="question" modifiers="GDK_META_MASK"/>
+	</xsl:template>
+
+</xsl:stylesheet>
+

Deleted: trunk/dports/gnome/gpodder/files/patch-src-gpodder-gui-py.diff
===================================================================
--- trunk/dports/gnome/gpodder/files/patch-src-gpodder-gui-py.diff	2012-12-03 20:01:55 UTC (rev 100207)
+++ trunk/dports/gnome/gpodder/files/patch-src-gpodder-gui-py.diff	2012-12-03 20:06:02 UTC (rev 100208)
@@ -1,30 +0,0 @@
---- src/gpodder/gui.py.orig	2011-10-19 16:16:12.000000000 +0200
-+++ src/gpodder/gui.py	2011-10-30 14:14:12.000000000 +0100
-@@ -280,22 +280,22 @@
-             # http://sourceforge.net/apps/trac/gtk-osx/wiki/Integrate
-             if getattr(gtk.gdk, 'WINDOWING', 'x11') == 'quartz':
-                 try:
--                    import igemacintegration as igemi
-+                    import gtkmacintegration as igemi
- 
-                     # Move the menu bar from the window to the Mac menu bar
-                     self.mainMenu.hide()
--                    igemi.ige_mac_menu_set_menu_bar(self.mainMenu)
-+                    igemi.gtk_mac_menu_set_menu_bar(self.mainMenu)
- 
-                     # Reparent some items to the "Application" menu
-                     for widget in ('/mainMenu/menuHelp/itemAbout', \
-                                    '/mainMenu/menuPodcasts/itemPreferences'):
-                         item = self.uimanager1.get_widget(widget)
--                        group = igemi.ige_mac_menu_add_app_menu_group()
--                        igemi.ige_mac_menu_add_app_menu_item(group, item, None)
-+                        group = igemi.gtk_mac_menu_add_app_menu_group()
-+                        igemi.gtk_mac_menu_add_app_menu_item(group, item, None)
- 
-                     quit_widget = '/mainMenu/menuPodcasts/itemQuit'
-                     quit_item = self.uimanager1.get_widget(quit_widget)
--                    igemi.ige_mac_menu_set_quit_menu_item(quit_item)
-+                    igemi.gtk_mac_menu_set_quit_menu_item(quit_item)
-                 except ImportError:
-                     print >>sys.stderr, """
-                     Warning: ige-mac-integration not found - no native menus.

    

elelay＠macports.org

tags

participants (1)