FreeBSD Bugzilla – Attachment 99859 Details for
Bug 139042
deskutils/blogtk: fails to start as the version in the ports no longer works with it's dependencies
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
blogtk.diff
blogtk.diff (text/x-diff; charset=us-ascii), 6.48 KB, created by
Martin Tournoij
on 2010-05-15 00:42:17 UTC
(
hide
)
Description:
blogtk.diff
Filename:
MIME Type:
Creator:
Martin Tournoij
Created:
2010-05-15 00:42:17 UTC
Size:
6.48 KB
patch
obsolete
>diff -urN -x CVS -x .svn -I '^# .FreeBSD: ' deskutils/blogtk.orig/Makefile deskutils/blogtk/Makefile >--- deskutils/blogtk.orig/Makefile 2010-05-14 22:11:24.000000000 +0000 >+++ deskutils/blogtk/Makefile 2010-05-15 01:38:21.000000000 +0000 >@@ -6,35 +6,26 @@ > # > > PORTNAME= blogtk >-PORTVERSION= 1.1 >-PORTREVISION= 6 >-CATEGORIES= deskutils >-MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/BloGTK-${PORTVERSION} >-DISTNAME= ${PORTNAME}_${PORTVERSION} >+PORTVERSION= 2.0 >+CATEGORIES= deskutils python >+MASTER_SITES= http://launchpad.net/${PORTNAME}/${PORTVERSION}/${PORTVERSION}/+download/ > > MAINTAINER= jbq@caraldi.com > COMMENT= A client for Blogger, Movable Type, and other blogging systems > >-WRKSRC= ${WRKDIR}/BloGTK-${PORTVERSION} >+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedparser \ >+ ${PYTHON_SITELIBDIR}/atom/__init__.py:${PORTSDIR}/devel/py-gdata \ >+ ${PYTHON_SITELIBDIR}/webkit/__init__.py:${PORTSDIR}/www/py-webkitgtk > >-USE_BZIP2= yes >-USE_GNOME= pygnomeextras >-USE_PYTHON= 2.4+ >+USE_GNOME= pygnomeextras pygtksourceview >+USE_PYTHON= 2.3-2.7 # No Python 3 support >+ >+# Is there a better way to handle this? Launchpad depends on 302 directs it seems >+FETCH_ARGS= -pRr > NO_BUILD= yes >+MAKE_ENV+= PYTHON="${PYTHON_CMD}" > >-post-patch: >- @${FIND} ${WRKSRC}/src -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e \ >- 's|/usr/share|${PREFIX}/share|g ; \ >- s|gtk\.FALSE|False|g ; \ >- s|gtk\.TRUE|True|g' >- >-do-install: >- @${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/blogtk >- ${INSTALL_SCRIPT} ${WRKSRC}/src/*.py ${PYTHONPREFIX_SITELIBDIR}/blogtk >- @${LN} -fs ${PYTHONPREFIX_SITELIBDIR}/blogtk/BloGTK.py ${PREFIX}/bin/blogtk >- @${MKDIR} ${DATADIR} >- ${INSTALL_DATA} ${WRKSRC}/pixmaps/*.glade ${DATADIR} >- ${INSTALL_DATA} ${WRKSRC}/pixmaps/*.gladep ${DATADIR} >- ${INSTALL_DATA} ${WRKSRC}/pixmaps/*.png ${DATADIR} >+post-install: >+ @${RM} ${DATADIR}2/lib/blogtk2/*.py~ > > .include <bsd.port.mk> >diff -urN -x CVS -x .svn -I '^# .FreeBSD: ' deskutils/blogtk.orig/distinfo deskutils/blogtk/distinfo >--- deskutils/blogtk.orig/distinfo 2010-05-14 22:11:24.000000000 +0000 >+++ deskutils/blogtk/distinfo 2010-05-14 22:19:08.000000000 +0000 >@@ -1,3 +1,3 @@ >-MD5 (blogtk_1.1.tar.bz2) = cd2d2521a261867cd9c830a81d3d4408 >-SHA256 (blogtk_1.1.tar.bz2) = de12ee193f14e10f4d9a81804adb242316f42a27bc4c2bd11470b4b6c830eeab >-SIZE (blogtk_1.1.tar.bz2) = 64325 >+MD5 (blogtk-2.0.tar.gz) = f7fd77db6a8ba92898c03ef35f658e6f >+SHA256 (blogtk-2.0.tar.gz) = 0557bd151a0c1837f91f1d9984d8afa308a462727a9701dfeeb4f17aa332828a >+SIZE (blogtk-2.0.tar.gz) = 530263 >diff -urN -x CVS -x .svn -I '^# .FreeBSD: ' deskutils/blogtk.orig/files/patch-blogtk-no-category deskutils/blogtk/files/patch-blogtk-no-category >--- deskutils/blogtk.orig/files/patch-blogtk-no-category 2010-05-14 22:11:24.000000000 +0000 >+++ deskutils/blogtk/files/patch-blogtk-no-category 1970-01-01 00:00:00.000000000 +0000 >@@ -1,19 +0,0 @@ >---- src/BloGTK.py.orig Mon Jan 10 04:51:05 2005 >-+++ src/BloGTK.py Mon Jul 17 17:04:32 2006 >-@@ -609,6 +609,7 @@ >- blogID = item['blogid'] >- >- # Are we using MT? If so, we need to pull the category ID as well. >-+ catID = "0" >- if self.system == "mt": >- >- catName = self.catCombo.entry.get_text() >-@@ -619,8 +620,6 @@ >- for k,v in item.items(): >- if item['categoryName'] == catName: >- catID = item['categoryId'] >-- else: >-- catID = "0" >- >- # 0.95 - We also need to pull our extended entry as well as our other >- # fields >diff -urN -x CVS -x .svn -I '^# .FreeBSD: ' deskutils/blogtk.orig/pkg-descr deskutils/blogtk/pkg-descr >--- deskutils/blogtk.orig/pkg-descr 2010-05-14 22:11:24.000000000 +0000 >+++ deskutils/blogtk/pkg-descr 2010-05-14 22:20:32.000000000 +0000 >@@ -1,5 +1,13 @@ >-BloGTK is a weblog client that allows you to post to your weblog without the >-need for a separate browser window. BloGTK allows you to connect with many >-weblog systems such as Blogger, Movable Type, pMachine, and more. >+BloGTK is a weblog posting client written in Python for any platform that >+supports Python and the GTK widget set. BloGTK allows you to connect to your >+weblog with XML-RPC and create new posts. > >-WWW: http://blogtk.sourceforge.net/ >+Supported weblogs: >+MovableType versions 2.5 or later. >+Blogger >+WordPress 1.5 or later or WordPress.com >+Windows Live Spaces >+Expression Engine (but autoconfiguration does not work) >+Any blog that uses the MetaWeblog API. >+ >+WWW: http://blogtk.jayreding.com/ >diff -urN -x CVS -x .svn -I '^# .FreeBSD: ' deskutils/blogtk.orig/pkg-plist deskutils/blogtk/pkg-plist >--- deskutils/blogtk.orig/pkg-plist 2010-05-14 22:11:24.000000000 +0000 >+++ deskutils/blogtk/pkg-plist 2010-05-15 01:37:36.000000000 +0000 >@@ -1,20 +1,36 @@ >-bin/blogtk >-%%PYTHON_SITELIBDIR%%/blogtk/BloGTK.py >-%%PYTHON_SITELIBDIR%%/blogtk/config.py >-%%PYTHON_SITELIBDIR%%/blogtk/customtags.py >-%%PYTHON_SITELIBDIR%%/blogtk/post.py >-%%PYTHON_SITELIBDIR%%/blogtk/preview.py >-%%PYTHON_SITELIBDIR%%/blogtk/proxy.py >-%%PYTHON_SITELIBDIR%%/blogtk/spellcheck.py >-%%DATADIR%%/b-32.png >-%%DATADIR%%/blogtk-icon.png >-%%DATADIR%%/blogtk-logo.png >-%%DATADIR%%/blogtk.glade >-%%DATADIR%%/blogtk.gladep >-%%DATADIR%%/stock_insert-image.png >-%%DATADIR%%/stock_insert-table.png >-%%DATADIR%%/stock_link.png >-%%DATADIR%%/stock_para.png >-%%DATADIR%%/stock_text_indent.png >-@dirrm %%DATADIR%% >-@dirrm %%PYTHON_SITELIBDIR%%/blogtk >+bin/blogtk2 >+share/pixmaps/blogtk-icon.png >+%%DATADIR%%2/lib/blogtk2/BeautifulSoup.py >+%%DATADIR%%2/lib/blogtk2/BeautifulSoup.pyc >+%%DATADIR%%2/lib/blogtk2/__init__.py >+%%DATADIR%%2/lib/blogtk2/__init__.pyc >+%%DATADIR%%2/lib/blogtk2/atomapi.py >+%%DATADIR%%2/lib/blogtk2/atomapi.pyc >+%%DATADIR%%2/lib/blogtk2/blogger.py >+%%DATADIR%%2/lib/blogtk2/blogger.pyc >+%%DATADIR%%2/lib/blogtk2/bloggeratom.py >+%%DATADIR%%2/lib/blogtk2/bloggeratom.pyc >+%%DATADIR%%2/lib/blogtk2/config.py >+%%DATADIR%%2/lib/blogtk2/config.pyc >+%%DATADIR%%2/lib/blogtk2/editor.py >+%%DATADIR%%2/lib/blogtk2/editor.pyc >+%%DATADIR%%2/lib/blogtk2/filehandler.py >+%%DATADIR%%2/lib/blogtk2/filehandler.pyc >+%%DATADIR%%2/lib/blogtk2/firstrun.py >+%%DATADIR%%2/lib/blogtk2/firstrun.pyc >+%%DATADIR%%2/lib/blogtk2/main.py >+%%DATADIR%%2/lib/blogtk2/main.pyc >+%%DATADIR%%2/lib/blogtk2/metaweblog.py >+%%DATADIR%%2/lib/blogtk2/metaweblog.pyc >+%%DATADIR%%2/lib/blogtk2/mtapi.py >+%%DATADIR%%2/lib/blogtk2/mtapi.pyc >+%%DATADIR%%2/glade/blogtk2.glade >+%%DATADIR%%2/res/b-32.png >+%%DATADIR%%2/res/blogtk-logo.png >+share/applications/blogtk.desktop >+@dirrm %%DATADIR%%2/i18n >+@dirrm %%DATADIR%%2/res >+@dirrm %%DATADIR%%2/glade >+@dirrm %%DATADIR%%2/lib/blogtk2 >+@dirrm %%DATADIR%%2/lib >+@dirrm %%DATADIR%%2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 139042
: 99859