[68178] trunk/dports/gnome/gpodder

elelay at macports.org elelay at macports.org
Fri May 28 10:41:33 PDT 2010


Revision: 68178
          http://trac.macports.org/changeset/68178
Author:   elelay at macports.org
Date:     2010-05-28 10:41:29 -0700 (Fri, 28 May 2010)
Log Message:
-----------
updated to 2.6 - drops dependency on gnome-python-extras

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

Removed Paths:
-------------
    trunk/dports/gnome/gpodder/files/leopard_workarround.diff

Modified: trunk/dports/gnome/gpodder/Portfile
===================================================================
--- trunk/dports/gnome/gpodder/Portfile	2010-05-28 17:30:36 UTC (rev 68177)
+++ trunk/dports/gnome/gpodder/Portfile	2010-05-28 17:41:29 UTC (rev 68178)
@@ -2,10 +2,9 @@
 # $Id$
 
 PortSystem          1.0
-revision			1
 
 name                gpodder
-version             2.4
+version             2.6
 categories          gnome audio
 license             GPLv3
 maintainers         elelay
@@ -20,9 +19,9 @@
 homepage            http://gpodder.org
 master_sites        http://download.berlios.de/gpodder/
 
-checksums           md5     3d0ffc2c30053c94e99feb302f4f8b83 \
-                    sha1    12a395c5a6d71f239b462e910612d68ec30f0647 \
-                    rmd160  2d274a4fc325fc11b2d21fe36b0ba74097a3ab2a
+checksums           md5     61ddfbf63c0f1de4b5d89c6b94f07339 \
+                    sha1    6b4e6a7c7c7565bc664cc3bb366d3dc2a7e5f9c2 \
+                    rmd160  949da3a0c99c097183d7cb6926fa04a9dfb1492e
 
 depends_build       port:help2man\
                     port:intltool
@@ -30,15 +29,10 @@
 depends_lib         port:vorbis-tools\
                     port:lame
 
-#temporary patchfile until it's committed to the gPodder repo
-patchfiles			leopard_workarround.diff
-patch.pre_args		-p1
-
 variant python25 conflicts python26 description {Use Python 2.5} {
     depends_lib-append  port:py25-feedparser\
                         port:py25-pil\
                         port:dbus-python25\
-                        port:gnome-python-extras\
                         port:py25-mygpoclient
 
     post-patch {
@@ -55,7 +49,6 @@
     depends_lib-append  port:py26-feedparser\
                         port:py26-pil\
                         port:dbus-python26\
-                        port:gnome-python26-extras\
                         port:py26-mygpoclient
     
     post-patch {
@@ -83,12 +76,20 @@
 	# leverage ige-mac-integration to have a native menu for gPodder
 	# TODO: python26 variant for ige-mac-integration instead of a different port
 	if {[variant_isset python25]} {
-		depends_lib-append  port:ige-mac-integration\
+		depends_lib-append  port:ige-mac-integration
 	} else {
-		depends_lib-append  port:py26-ige-mac-integration\
+		depends_lib-append  port:py26-ige-mac-integration
 	}
 }
 
+variant html_notes description {Use WebkitGtk+ to show episode notes in HTML format} {
+	if {[variant_isset python25]} {
+		depends_lib-append  port:py25-webkitgtk
+	} else {
+		depends_lib-append  port:py26-webkitgtk
+	}
+}
+
 use_configure       no
 
 build {}

Deleted: trunk/dports/gnome/gpodder/files/leopard_workarround.diff
===================================================================
--- trunk/dports/gnome/gpodder/files/leopard_workarround.diff	2010-05-28 17:30:36 UTC (rev 68177)
+++ trunk/dports/gnome/gpodder/files/leopard_workarround.diff	2010-05-28 17:41:29 UTC (rev 68178)
@@ -1,87 +0,0 @@
-diff --git a/data/osx/Info-10.4.plist b/data/osx/Info-10.4.plist
-new file mode 100644
-index 0000000..f7eac7e
---- /dev/null
-+++ b/data/osx/Info-10.4.plist
-@@ -0,0 +1,36 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
-+                       "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+	<dict>
-+		<key>CFBundleName</key>
-+		<string>gPodder</string>
-+		<key>CFBundleShortVersionString</key>
-+		<string>__VERSION__</string>
-+		<key>CFBundleGetInfoString</key>
-+		<string>gPodder v__VERSION__</string>
-+		<key>CFBundleAllowMixedLocalizations</key>
-+		<string>false</string>
-+		<key>CFBundleInfoDictionaryVersion</key>
-+		<string>6.0</string>
-+		<key>CFBundleExecutable</key>
-+		<string>gpodder</string>
-+		<key>CFBundleDevelopmentRegion</key>
-+		<string>English</string>
-+		<key>CFBundlePackageType</key>
-+		<string>APPL</string>
-+		<key>CFBundleSignature</key>
-+		<string>GPOD</string>
-+		<key>CFBundleVersion</key>
-+		<string>__VERSION__</string>
-+		<key>CFBundleIconFile</key>
-+		<string>icon.icns</string>
-+		<key>CFBundleIdentifier</key>
-+		<string>org.gpodder.gpodder</string>
-+		<key>LSEnvironment</key>
-+		<dict>
-+			<key>DISPLAY</key>
-+			<string>:0</string>
-+		</dict>
-+	</dict>
-+</plist>
-diff -u a/data/osx/Info.plist b/data/osx/Info.plist
---- a/data/osx/Info.plist	2010-04-03 12:51:57.000000000 +0200
-+++ b/data/osx/Info.plist	2010-04-03 12:52:19.000000000 +0200
-@@ -27,10 +27,5 @@
- 		<string>icon.icns</string>
- 		<key>CFBundleIdentifier</key>
- 		<string>org.gpodder.gpodder</string>
--		<key>LSEnvironment</key>
--		<dict>
--			<key>DISPLAY</key>
--			<string>:0</string>
--		</dict>
- 	</dict>
- </plist>
-diff --git a/data/osx/Makefile b/data/osx/Makefile
-index dacd306..1695972 100644
---- a/data/osx/Makefile
-+++ b/data/osx/Makefile
-@@ -26,6 +26,14 @@ RESOURCESDIR=$(APPDIR)/Contents/Resources
- # current version of gPodder
- VERSION=2.3
- 
-+# set OSXVERSION to darwin8 to get the Mac OS X Tiger version of the plist.
-+OSXVERSION=darwin8
-+ifeq ($(OSXVERSION),darwin8)
-+PLIST=Info-10.4.plist
-+else
-+PLIST=Info.plist
-+endif
-+
- all:$(BINDIR)/gpodder\
- 	$(RESOURCESDIR)/icon.icns\
- 	$(APPDIR)/Contents/PkgInfo\
-@@ -46,7 +54,7 @@ $(RESOURCESDIR)/icon.icns: icon.icns $(RESOURCESDIR)
- $(APPDIR)/Contents/PkgInfo: PkgInfo $(RESOURCESDIR)
- 	install $< $@
- 
--$(APPDIR)/Contents/Info.plist: Info.plist $(APPDIR)/Contents
-+$(APPDIR)/Contents/Info.plist: $(PLIST) $(APPDIR)/Contents
- 	sed "s|__VERSION__|$(VERSION)|g" $< > $@
- 
- clean:
--- 
-1.7.0.2
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100528/4de22b67/attachment-0001.html>


More information about the macports-changes mailing list