cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 0.6, but disable the terminal for now which has some serious

Browse Source 
issues.
This commit is contained in:
jasper 2011-10-20 20:45:05 +00:00
parent fdf496d7d8
commit c62c45c582
8 changed files with 155 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
devel/giggle/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.20 2011/09/29 08:56:13 jasper Exp $
# $OpenBSD: Makefile,v 1.21 2011/10/20 20:45:05 jasper Exp $
COMMENT= gtk-based git repository viewer
CATEGORIES= devel x11
GNOME_VERSION= 0.5
GNOME_VERSION= 0.6
GNOME_PROJECT= giggle
REVISION= 7
CATEGORIES= devel x11
SHARED_LIBS += giggle 0.0 # 0.0
SHARED_LIBS += giggle-git 0.0 # 0.0
@ -19,26 +20,29 @@ PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
EXTRACT_SUFX= .tar.bz2
MODULES= devel/gettext \
x11/gnome
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo
WANTLIB += drm expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += gtk-x11-2.0 gtksourceview-2.0 m pango-1.0 pangocairo-1.0
WANTLIB += cairo-gobject drm expat ffi fontconfig freetype gdk-3
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0 gtk-3 gtksourceview-3.0 m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += vte xcb xcb-render xcb-shm xml2 z
WANTLIB += xcb xcb-render xcb-shm xml2 z # vte2_90
RUN_DEPENDS= devel/git
BUILD_DEPENDS+= devel/git
LIB_DEPENDS= devel/vte \
x11/gtksourceview
LIB_DEPENDS= x11/gtksourceview3
MODGNOME_TOOLS= yelp
MODGNOME_DESKTOP_FILE= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--disable-evolution-data-server
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-evolution-data-server
# Disable the terminal for now: https://bugzilla.gnome.org/show_bug.cgi?id=662332
CONFIGURE_ARGS+=--disable-terminal
SUBST_VARS+= GNOME_VERSION
.include <bsd.port.mk>

10
devel/giggle/distinfo
View File

@ -1,5 +1,5 @@
MD5 (giggle-0.5.tar.bz2) = kdIAD7l8XLC7ACft9ETs/w==
RMD160 (giggle-0.5.tar.bz2) = 7i/1Gde9KfWaW0smNC4d/HkW3rI=
SHA1 (giggle-0.5.tar.bz2) = QxQ+Sb6PUQ4SbBnGjOGYcESOlDA=
SHA256 (giggle-0.5.tar.bz2) = Lixw0lFZ0xyH0VXJ95ng8f6zD+JvyKryB8prO9myslk=
SIZE (giggle-0.5.tar.bz2) = 486406
MD5 (giggle-0.6.tar.xz) = j0ULakd82HgDJlCfr4uhmw==
RMD160 (giggle-0.6.tar.xz) = LXWGTOZKJ+Z1jWL9kSTanpKdMmw=
SHA1 (giggle-0.6.tar.xz) = pW7PCJCx9qD8wVKxSssR5kei2Xc=
SHA256 (giggle-0.6.tar.xz) = vLhktdI7EMrGN2V0ry+fqODb0u3ys6dxl53bNiyiHrM=
SIZE (giggle-0.6.tar.xz) = 1781508

30
devel/giggle/patches/patch-configure Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-configure,v 1.1 2011/10/20 20:45:05 jasper Exp $
Remove a few compiler options GCC 4.2.1 doesn't understand.
--- configure.orig Thu Oct 20 22:13:47 2011
+++ configure Thu Oct 20 22:14:08 2011
@@ -15844,18 +15844,18 @@ if test "$GCC" = "yes"; then
WARNINGFLAGS_C="$WARNINGFLAGS_C -Wformat-security"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-include-dirs"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-format-attribute"
- WARNINGFLAGS_C="$WARNINGFLAGS_C -Wclobbered"
- WARNINGFLAGS_C="$WARNINGFLAGS_C -Wempty-body"
- WARNINGFLAGS_C="$WARNINGFLAGS_C -Wignored-qualifiers"
+# WARNINGFLAGS_C="$WARNINGFLAGS_C -Wclobbered"
+# WARNINGFLAGS_C="$WARNINGFLAGS_C -Wempty-body"
+# WARNINGFLAGS_C="$WARNINGFLAGS_C -Wignored-qualifiers"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Wsign-compare"
- WARNINGFLAGS_C="$WARNINGFLAGS_C -Wtype-limits"
+# WARNINGFLAGS_C="$WARNINGFLAGS_C -Wtype-limits"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Wuninitialized"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Waggregate-return"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Wdeclaration-after-statement"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Wshadow"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Wno-strict-aliasing"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Winline"
- WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-parameter-type"
+# WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-parameter-type"
WARNINGFLAGS_C="$WARNINGFLAGS_C -Woverride-init"
else
WARNINGFLAGS_C=""

8
devel/giggle/patches/patch-libgiggle-git_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libgiggle-git_Makefile_in,v 1.1 2010/04/22 15:01:53 landry Exp $
--- libgiggle-git/Makefile.in.orig Sat Apr 17 17:11:31 2010
+++ libgiggle-git/Makefile.in Thu Apr 22 13:53:41 2010
@@ -358,7 +358,6 @@ libgiggle_git_la_LIBADD = \
$OpenBSD: patch-libgiggle-git_Makefile_in,v 1.2 2011/10/20 20:45:05 jasper Exp $
--- libgiggle-git/Makefile.in.orig Thu Oct 20 21:38:53 2011
+++ libgiggle-git/Makefile.in Thu Oct 20 22:12:06 2011
@@ -360,7 +360,6 @@ libgiggle_git_la_LIBADD = \
libgiggle_git_la_LDFLAGS = \
$(AM_LDFLAGS) \
-version-info $(LIBGIGGLE_GIT_ABI) \

17
devel/giggle/patches/patch-libgiggle-git_giggle-git-revisions_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-libgiggle-git_giggle-git-revisions_c,v 1.2 2011/09/29 20:28:59 jasper Exp $
From 3564c5abe28029a028fb41dac6210c902ff93bfa Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Thu, 29 Sep 2011 20:27:28 +0000
Subject: Fix implicit declaration of sscanf().
--- libgiggle-git/giggle-git-revisions.c.orig Thu Sep 29 10:49:09 2011
+++ libgiggle-git/giggle-git-revisions.c Thu Sep 29 10:49:21 2011
@@ -21,6 +21,7 @@
#include "config.h"
#include "giggle-git-revisions.h"
#include <string.h>
+#include <stdio.h>
enum {

15
devel/giggle/patches/patch-plugins_giggle-view-terminal_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-plugins_giggle-view-terminal_c,v 1.2 2011/05/22 17:02:35 jasper Exp $
Needed if we actually want a real shell inside the term
--- plugins/giggle-view-terminal.c.orig Thu Apr 22 16:09:37 2010
+++ plugins/giggle-view-terminal.c Thu Apr 22 16:09:57 2010
@@ -193,7 +193,7 @@ giggle_view_terminal_append_tab (GiggleViewTerminal *v
vte_terminal_fork_command (VTE_TERMINAL (terminal),
shell ? shell : "/bin/sh",
NULL, NULL, directory,
- FALSE, FALSE, FALSE);
+ TRUE, TRUE, TRUE);
title = g_filename_display_name (directory);
label = view_terminal_create_label (view, terminal, title);

5
devel/giggle/pkg/PFRAG.shared
View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2010/04/22 15:01:53 landry Exp $
lib/giggle/plugins/0.5/libpersonal-details.so
lib/giggle/plugins/0.5/libterminal-view.so
@comment $OpenBSD: PFRAG.shared,v 1.3 2011/10/20 20:45:05 jasper Exp $
lib/giggle/plugins/${GNOME_VERSION}/libpersonal-details.so
@lib lib/libgiggle-git.so.${LIBgiggle-git_VERSION}
@lib lib/libgiggle.so.${LIBgiggle_VERSION}

108
devel/giggle/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2010/04/22 15:01:53 landry Exp $
@comment $OpenBSD: PLIST,v 1.5 2011/10/20 20:45:05 jasper Exp $
%%SHARED%%
@bin bin/giggle
include/giggle/
@ -9,6 +9,7 @@ include/giggle/libgiggle-git/giggle-git-add.h
include/giggle/libgiggle-git/giggle-git-authors.h
include/giggle/libgiggle-git/giggle-git-blame.h
include/giggle/libgiggle-git/giggle-git-cat-file.h
include/giggle/libgiggle-git/giggle-git-clone.h
include/giggle/libgiggle-git/giggle-git-commit.h
include/giggle/libgiggle-git/giggle-git-config-read.h
include/giggle/libgiggle-git/giggle-git-config-write.h
@ -29,13 +30,10 @@ include/giggle/libgiggle/giggle-enums.h
include/giggle/libgiggle/giggle-marshal.h
lib/giggle/
lib/giggle/plugins/
lib/giggle/plugins/0.5/
lib/giggle/plugins/0.5/libpersonal-details.a
lib/giggle/plugins/0.5/libpersonal-details.la
lib/giggle/plugins/0.5/libterminal-view.a
lib/giggle/plugins/0.5/libterminal-view.la
lib/giggle/plugins/0.5/personal-details.xml
lib/giggle/plugins/0.5/terminal-view.xml
lib/giggle/plugins/${GNOME_VERSION}/
@comment lib/giggle/plugins/${GNOME_VERSION}/libpersonal-details.a
@comment lib/giggle/plugins/${GNOME_VERSION}/libpersonal-details.la
lib/giggle/plugins/${GNOME_VERSION}/personal-details.xml
lib/libgiggle-git.a
lib/libgiggle-git.la
lib/libgiggle.a
@ -44,6 +42,91 @@ share/applications/giggle.desktop
share/giggle/
share/giggle/glade/
share/giggle/glade/main-window.ui
share/help/
share/help/C/
share/help/C/giggle/
share/help/C/giggle/browse-view.page
share/help/C/giggle/figures/
share/help/C/giggle/figures/giggle-browse_view_sections.png
share/help/C/giggle/figures/giggle-history_view_sections.png
share/help/C/giggle/history-view.page
share/help/C/giggle/index.page
share/help/C/giggle/introduction.page
share/help/C/giggle/license.page
share/help/C/giggle/opening-repositories.page
share/help/C/giggle/tagging-commits.page
share/help/cs/
share/help/cs/giggle/
share/help/cs/giggle/browse-view.page
share/help/cs/giggle/figures/
share/help/cs/giggle/figures/giggle-browse_view_sections.png
share/help/cs/giggle/figures/giggle-history_view_sections.png
share/help/cs/giggle/history-view.page
share/help/cs/giggle/index.page
share/help/cs/giggle/introduction.page
share/help/cs/giggle/license.page
share/help/cs/giggle/opening-repositories.page
share/help/cs/giggle/tagging-commits.page
share/help/de/
share/help/de/giggle/
share/help/de/giggle/browse-view.page
share/help/de/giggle/figures/
share/help/de/giggle/figures/giggle-browse_view_sections.png
share/help/de/giggle/figures/giggle-history_view_sections.png
share/help/de/giggle/history-view.page
share/help/de/giggle/index.page
share/help/de/giggle/introduction.page
share/help/de/giggle/license.page
share/help/de/giggle/opening-repositories.page
share/help/de/giggle/tagging-commits.page
share/help/es/
share/help/es/giggle/
share/help/es/giggle/browse-view.page
share/help/es/giggle/figures/
share/help/es/giggle/figures/giggle-browse_view_sections.png
share/help/es/giggle/figures/giggle-history_view_sections.png
share/help/es/giggle/history-view.page
share/help/es/giggle/index.page
share/help/es/giggle/introduction.page
share/help/es/giggle/license.page
share/help/es/giggle/opening-repositories.page
share/help/es/giggle/tagging-commits.page
share/help/fr/
share/help/fr/giggle/
share/help/fr/giggle/browse-view.page
share/help/fr/giggle/figures/
share/help/fr/giggle/figures/giggle-browse_view_sections.png
share/help/fr/giggle/figures/giggle-history_view_sections.png
share/help/fr/giggle/history-view.page
share/help/fr/giggle/index.page
share/help/fr/giggle/introduction.page
share/help/fr/giggle/license.page
share/help/fr/giggle/opening-repositories.page
share/help/fr/giggle/tagging-commits.page
share/help/pl/
share/help/pl/giggle/
share/help/pl/giggle/browse-view.page
share/help/pl/giggle/figures/
share/help/pl/giggle/figures/giggle-browse_view_sections.png
share/help/pl/giggle/figures/giggle-history_view_sections.png
share/help/pl/giggle/history-view.page
share/help/pl/giggle/index.page
share/help/pl/giggle/introduction.page
share/help/pl/giggle/license.page
share/help/pl/giggle/opening-repositories.page
share/help/pl/giggle/tagging-commits.page
share/help/sl/
share/help/sl/giggle/
share/help/sl/giggle/browse-view.page
share/help/sl/giggle/figures/
share/help/sl/giggle/figures/giggle-browse_view_sections.png
share/help/sl/giggle/figures/giggle-history_view_sections.png
share/help/sl/giggle/history-view.page
share/help/sl/giggle/index.page
share/help/sl/giggle/introduction.page
share/help/sl/giggle/license.page
share/help/sl/giggle/opening-repositories.page
share/help/sl/giggle/tagging-commits.page
share/icons/
share/icons/hicolor/
share/icons/hicolor/16x16/
@ -76,10 +159,10 @@ share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/giggle.svg
share/locale/ca/LC_MESSAGES/giggle.mo
share/locale/ca@valencia/LC_MESSAGES/giggle.mo
share/locale/cs/LC_MESSAGES/giggle.mo
share/locale/da/LC_MESSAGES/giggle.mo
share/locale/de/LC_MESSAGES/giggle.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/giggle.mo
share/locale/es/LC_MESSAGES/giggle.mo
share/locale/fr/LC_MESSAGES/giggle.mo
@ -87,13 +170,14 @@ share/locale/gl/LC_MESSAGES/giggle.mo
share/locale/hu/LC_MESSAGES/giggle.mo
share/locale/ja/LC_MESSAGES/giggle.mo
share/locale/nb/LC_MESSAGES/giggle.mo
share/locale/pa/
share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/giggle.mo
share/locale/pl/LC_MESSAGES/giggle.mo
share/locale/pt_BR/LC_MESSAGES/giggle.mo
share/locale/ro/LC_MESSAGES/giggle.mo
share/locale/ru/LC_MESSAGES/giggle.mo
share/locale/sl/LC_MESSAGES/giggle.mo
share/locale/sv/LC_MESSAGES/giggle.mo
share/locale/uk/LC_MESSAGES/giggle.mo
share/locale/vi/LC_MESSAGES/giggle.mo
share/locale/zh_CN/LC_MESSAGES/giggle.mo
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true