ports/160506: [UPATE] deskutils/gnote: update to 0.7.5
Ruslan Mahmatkhanov
cvs-src at yandex.ru
Tue Sep 6 08:30:01 UTC 2011
>Number: 160506
>Category: ports
>Synopsis: [UPATE] deskutils/gnote: update to 0.7.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 06 08:30:01 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Ruslan Mahmatkhanov
>Release: 9.0-BETA1
>Organization:
>Environment:
9.0-BETA1 i386
>Description:
- update to 0.7.5
- add missing deps per README (pcre, libxml2, libxslt, gtk20)
- switch to USE_XZ
- move CPPFLAGS out of CONFIGURE_ENV
- install license via license framework, not manually
- whitespace fixes
- remove check for unsupported FreeBSD 6.x
- Remove this patches, they were applied upstream:
# deleted: files/patch-src_debug.cpp
# deleted: files/patch-src_noterenamedialog.cpp
# deleted: files/patch-src_sharp_datetime.cpp
tinderbuild logs:
7.4: http://happy-nation.by.ru/ports/tb/7.4/gnote-0.7.5.log
8.2: http://happy-nation.by.ru/ports/tb/8.2/gnote-0.7.5.log
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/Makefile b/Makefile
index a1df9f3..f538266 100644
--- a/Makefile
+++ b/Makefile
@@ -7,40 +7,45 @@
#
PORTNAME= gnote
-PORTVERSION= 0.7.3
+PORTVERSION= 0.7.5
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
MAINTAINER= gnome at FreeBSD.org
COMMENT= A port of Tomboy to C++, note taking application
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
+
LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
gtkspell.0:${PORTSDIR}/textproc/gtkspell \
boost_filesystem.4:${PORTSDIR}/devel/boost-libs \
- uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
+ uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \
+ pcre.0:${PORTSDIR}/devel/pcre
USE_GMAKE= yes
-USE_BZIP2= yes
-USE_GNOME= gnomehack gnomeprefix gconf2 intltool ltverhack gnomepanel
+USE_XZ= yes
+USE_GNOME= gnomehack gnomeprefix gconf2 gtk20 intltool libxml2 libxslt \
+ ltverhack gnomepanel
USE_GETTEXT= yes
INSTALLS_OMF= yes
GCONF_SCHEMAS= gnote.schemas
USE_AUTOTOOLS= libtool
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
+CPPFLAGS= "-I${LOCALBASE}/include"
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
PANELAPPLET_SERVER_DIR="${PREFIX}/libdata/bonobo/servers"
CONFIGURE_ARGS= --disable-dbus
-DOCS= AUTHORS COPYING ChangeLog NEWS README TODO
+DOCS= AUTHORS ChangeLog NEWS README TODO
MAN1= gnote.1
.if !defined(WITHOUT_APPLET)
LIB_DEPENDS+= panelappletmm-2.6:${PORTSDIR}/x11-toolkits/libpanelappletmm
-CONFIGURE_ARGS+=--enable-applet
+CONFIGURE_ARGS+= --enable-applet
PLIST_SUB+= APPLET=""
.else
-CONFIGURE_ARGS+=--disable-applet
+CONFIGURE_ARGS+= --disable-applet
PLIST_SUB+= APPLET="@comment "
.endif
@@ -48,10 +53,6 @@ PLIST_SUB+= VERSION=${PORTVERSION}
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 700000
-BROKEN= does not configure on 6.X
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|/usr/include/boost|${LOCALBASE}/include/boost|g' \
${WRKSRC}/configure
diff --git a/distinfo b/distinfo
index 5f4eaa7..1825906 100644
--- a/distinfo
+++ b/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnote-0.7.3.tar.bz2) = 4853315711baf7647cdae4c2f7d23e22e2b13322605efe3dd98796a06f928321
-SIZE (gnote-0.7.3.tar.bz2) = 1606926
+SHA256 (gnote-0.7.5.tar.xz) = ccb8a4922f167d9727fbc69f559b722004fb6bad3af329dad1fe5e2a3d3d18b8
+SIZE (gnote-0.7.5.tar.xz) = 1995192
diff --git a/files/patch-src_debug.cpp b/files/patch-src_debug.cpp
deleted file mode 100644
index 69c8127..0000000
--- a/files/patch-src_debug.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/debug.cpp.orig 2009-11-25 14:12:33.000000000 +0100
-+++ src/debug.cpp 2009-12-03 17:28:54.000000000 +0100
-@@ -126,7 +126,7 @@
- // static boost::recursive_mutex mutex;
- // boost::recursive_mutex::scoped_lock lock(mutex);
- char buf[128];
-- snprintf(buf, 128, "(%d) ", (int)pthread_self());
-+ snprintf(buf, 128, "(%ld) ", (pthread_t)pthread_self());
- fwrite(buf, 1, strlen(buf), stderr);
- fwrite(prefix, 1, strlen(prefix), stderr);
-
diff --git a/files/patch-src_noterenamedialog.cpp b/files/patch-src_noterenamedialog.cpp
deleted file mode 100644
index 0e70029..0000000
--- a/files/patch-src_noterenamedialog.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/noterenamedialog.cpp.orig 2010-03-14 00:32:43.000000000 -0500
-+++ src/noterenamedialog.cpp 2010-03-14 00:33:46.000000000 -0500
-@@ -63,6 +63,8 @@ private:
- Gtk::TreeModelColumn<Note::Ptr> m_column_note;
- };
-
-+ModelColumnRecord model_column_record;
-+
- ModelColumnRecord::ModelColumnRecord()
- : Gtk::TreeModelColumnRecord()
- , m_column_selected()
-@@ -152,7 +154,7 @@ NoteRenameDialog::NoteRenameDialog(const
- *renamed_note->get_window(),
- false,
- false)
-- , m_notes_model(Gtk::ListStore::create(ModelColumnRecord()))
-+ , m_notes_model(Gtk::ListStore::create(model_column_record))
- , m_dont_rename_button(_("_Don't Rename Links"), true)
- , m_rename_button(_("_Rename Links"), true)
- , m_select_all_button(_("Select All"))
diff --git a/files/patch-src_sharp_datetime.cpp b/files/patch-src_sharp_datetime.cpp
deleted file mode 100644
index d2a7601..0000000
--- a/files/patch-src_sharp_datetime.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
---- src/sharp/datetime.cpp.orig 2009-12-28 12:46:01.000000000 +0100
-+++ src/sharp/datetime.cpp 2010-02-14 15:47:21.000000000 +0100
-@@ -69,28 +69,28 @@ namespace sharp {
- int DateTime::day() const
- {
- struct tm result;
-- localtime_r(&m_date.tv_sec, &result);
-+ localtime_r((const time_t *)&m_date.tv_sec, &result);
- return result.tm_mday;
- }
-
- int DateTime::month() const
- {
- struct tm result;
-- localtime_r(&m_date.tv_sec, &result);
-+ localtime_r((const time_t *)&m_date.tv_sec, &result);
- return result.tm_mon + 1;
- }
-
- int DateTime::year() const
- {
- struct tm result;
-- localtime_r(&m_date.tv_sec, &result);
-+ localtime_r((const time_t *)&m_date.tv_sec, &result);
- return result.tm_year + 1900;
- }
-
- int DateTime::day_of_year() const
- {
- struct tm result;
-- localtime_r(&m_date.tv_sec, &result);
-+ localtime_r((const time_t *)&m_date.tv_sec, &result);
- return result.tm_yday;
- }
-
-@@ -109,14 +109,14 @@ namespace sharp {
- std::string DateTime::to_string(const char * format) const
- {
- struct tm result;
-- return _to_string(format, localtime_r(&m_date.tv_sec, &result));
-+ return _to_string(format, localtime_r((const time_t *)&m_date.tv_sec, &result));
- }
-
-
- std::string DateTime::to_short_time_string() const
- {
- struct tm result;
-- return _to_string("%R", localtime_r(&m_date.tv_sec, &result));
-+ return _to_string("%R", localtime_r((const time_t *)&m_date.tv_sec, &result));
- }
-
- std::string DateTime::to_iso8601() const
diff --git a/pkg-descr b/pkg-descr
index 5dd92d2..beb8b98 100644
--- a/pkg-descr
+++ b/pkg-descr
@@ -1,4 +1,4 @@
-Gnote is a port of Tomboy to C++.
+Gnote is a port of Tomboy to C++.
It is the same note taking application, including most of the add-ins (more
are to come). Synchronization support is being worked on.
diff --git a/pkg-plist b/pkg-plist
index 1b4c1b4..5372ccb 100644
--- a/pkg-plist
+++ b/pkg-plist
@@ -33,7 +33,6 @@ lib/gnote/addins/%%VERSION%%/underline.so
%%APPLET%%libexec/gnote-applet
share/applications/gnote.desktop
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
@@ -57,6 +56,25 @@ share/gnome/help/gnote/C/figures/note-template.png
share/gnome/help/gnote/C/figures/notebook-icon.png
share/gnome/help/gnote/C/gnote.xml
share/gnome/help/gnote/C/legal.xml
+share/gnome/help/gnote/cs/figures/add-notebook-search.png
+share/gnome/help/gnote/cs/figures/add-to-notebook.png
+share/gnome/help/gnote/cs/figures/delete-notebook.png
+share/gnome/help/gnote/cs/figures/gnote-main-menu.png
+share/gnome/help/gnote/cs/figures/gnote-new-note.png
+share/gnome/help/gnote/cs/figures/gnote-panel.png
+share/gnome/help/gnote/cs/figures/gnote-pindown.png
+share/gnome/help/gnote/cs/figures/gnote-pinup.png
+share/gnome/help/gnote/cs/figures/gnote-preferences-add-ins.png
+share/gnome/help/gnote/cs/figures/gnote-preferences-editing.png
+share/gnome/help/gnote/cs/figures/gnote-preferences-hotkeys.png
+share/gnome/help/gnote/cs/figures/gnote-preferences-synchronization.png
+share/gnome/help/gnote/cs/figures/gnote-tools.png
+share/gnome/help/gnote/cs/figures/move-notes-search.png
+share/gnome/help/gnote/cs/figures/new-notebook.png
+share/gnome/help/gnote/cs/figures/note-template.png
+share/gnome/help/gnote/cs/figures/notebook-icon.png
+share/gnome/help/gnote/cs/gnote.xml
+share/gnome/help/gnote/cs/legal.xml
share/gnome/help/gnote/de/figures/add-notebook-search.png
share/gnome/help/gnote/de/figures/add-to-notebook.png
share/gnome/help/gnote/de/figures/delete-notebook.png
@@ -263,6 +281,7 @@ share/locale/th/LC_MESSAGES/gnote.mo
share/locale/uk/LC_MESSAGES/gnote.mo
share/locale/zh_CN/LC_MESSAGES/gnote.mo
share/omf/gnote/gnote-C.omf
+share/omf/gnote/gnote-cs.omf
share/omf/gnote/gnote-de.omf
share/omf/gnote/gnote-el.omf
share/omf/gnote/gnote-es.omf
@@ -271,6 +290,16 @@ share/omf/gnote/gnote-sl.omf
share/omf/gnote/gnote-sv.omf
share/omf/gnote/gnote-zh_CN.omf
@dirrm share/omf/gnote
+ at dirrmtry share/locale/te/LC_MESSAGES
+ at dirrmtry share/locale/te
+ at dirrmtry share/locale/mr/LC_MESSAGES
+ at dirrmtry share/locale/mr
+ at dirrmtry share/locale/ca at valencia/LC_MESSAGES
+ at dirrmtry share/locale/ca at valencia
+ at dirrmtry share/locale/bn_IN/LC_MESSAGES
+ at dirrmtry share/locale/bn_IN
+ at dirrmtry share/locale/as/LC_MESSAGES
+ at dirrmtry share/locale/as
@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
@dirrm %%DATADIR%%/icons/hicolor/scalable
@dirrm %%DATADIR%%/icons/hicolor/48x48/actions
@@ -303,6 +332,8 @@ share/omf/gnote/gnote-zh_CN.omf
@dirrm share/gnome/help/gnote/el
@dirrm share/gnome/help/gnote/de/figures
@dirrm share/gnome/help/gnote/de
+ at dirrm share/gnome/help/gnote/cs/figures
+ at dirrm share/gnome/help/gnote/cs
@dirrm share/gnome/help/gnote/C/figures
@dirrm share/gnome/help/gnote/C
@dirrm share/gnome/help/gnote
@@ -311,13 +342,3 @@ share/omf/gnote/gnote-zh_CN.omf
@dirrmtry lib/gnote/addins/%%VERSION%%
@dirrmtry lib/gnote/addins
@dirrmtry lib/gnote
- at dirrmtry share/locale/te/LC_MESSAGES
- at dirrmtry share/locale/te
- at dirrmtry share/locale/mr/LC_MESSAGES
- at dirrmtry share/locale/mr
- at dirrmtry share/locale/ca at valencia/LC_MESSAGES
- at dirrmtry share/locale/ca at valencia
- at dirrmtry share/locale/bn_IN/LC_MESSAGES
- at dirrmtry share/locale/bn_IN
- at dirrmtry share/locale/as/LC_MESSAGES
- at dirrmtry share/locale/as
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list