mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

No more upstream, no more public distfile, no proper support for modern png

Browse Source
This commit is contained in:
Baptiste Daroussin 2014-12-24 12:24:39 +00:00
parent 31dd30f673
commit 7285bc5947
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=375447
17 changed files with 1 additions and 466 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MOVED
View File

@ -7330,3 +7330,4 @@ x11/nvidia-driver-96||2014-12-19|Removed: Not compatible with xserver 1.14
www/drupal7-jailadmin||2014-12-20|Removed per author's request; unmaintained
www/drupal7-vulnscan||2014-12-20|Removed per author's request; unmaintained
www/neon29|www/neon|2014-12-24|Rename to reflect upstream
graphics/pornview||2014-12-24|No more upstream, no more public distfile, no proper support for modern png

1
graphics/Makefile
View File

@ -792,7 +792,6 @@
SUBDIR += poppler-qt4
SUBDIR += poppler-qt5
SUBDIR += poppler-utils
SUBDIR += pornview
SUBDIR += potrace
SUBDIR += povray-meta
SUBDIR += povray36

46
graphics/pornview/Makefile
View File

@ -1,46 +0,0 @@
# Created by: Tilman Linneweh <arved@FreeBSD.org>
# $FreeBSD$
PORTNAME= pornview
PORTVERSION= 0.2.0.p.1
PORTREVISION= 30
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p./pre/}
MAINTAINER= ports@FreeBSD.org
COMMENT= Image viewer/manager
LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \
libpng15.so:${PORTSDIR}/graphics/png \
libxcb-render-util.so:${PORTSDIR}/x11/xcb-util-renderutil
USES= libtool pkgconfig
USE_XORG= x11 xi xext xinerama
USE_GNOME= gtk20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gtk2
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib -lXext -lX11 -lm
OPTIONS_DEFINE= LIBXINE MPLAYER NLS
OPTIONS_DEFAULT= LIBXINE
OPTIONS_SUB= yes
LIBXINE_CONFIGURE_ENABLE= xine
LIBXINE_LIB_DEPENDS= libxine.so:${PORTSDIR}/multimedia/libxine
MPLAYER_CONFIGURE_ENABLE= mplayer
MPLAYER_RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer
NLS_CONFIGURE_ENABLE= nls
post-patch:
@${REINPLACE_CMD} -e \
's|INCLUDED_LIBINTL=yes|INCLUDED_LIBINTL=no|g ; \
s|\\[$$][{]top_builddir[}]/intl/libintl.a|-lintl|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} 's|#define GTK_DISABLE_DEPRECATED||g' \
${WRKSRC}/src/support/widgets/*.c
.include <bsd.port.mk>

2
graphics/pornview/distinfo
View File

@ -1,2 +0,0 @@
SHA256 (pornview-0.2.0pre1.tar.gz) = 66502f936f743489dcff14e429a80e4670a60221187c34f58f87530229874fb9
SIZE (pornview-0.2.0pre1.tar.gz) = 608864

11
graphics/pornview/files/patch-charset.c
View File

@ -1,11 +0,0 @@
--- src/support/charset.c.orig Tue Nov 11 14:16:57 2008
+++ src/support/charset.c Tue Nov 11 14:17:13 2008
@@ -468,7 +468,7 @@ charset_conv (const gchar * src,
#ifdef USE_GTK2
{
- gint rbytes, wbytes;
+ gsize rbytes, wbytes;
return g_convert (src, -1, dest_codeset, src_codeset,
&rbytes, &wbytes, NULL);
}

24
graphics/pornview/files/patch-comment.c
View File

@ -1,24 +0,0 @@
--- src/comment.c.orig 2002-12-22 11:18:51.000000000 +0100
+++ src/comment.c 2009-04-19 14:33:47.000000000 +0200
@@ -187,7 +187,7 @@
{
Comment *comment;
- comment = COMMENT (gtk_type_new (comment_get_type ()));
+ comment = g_object_new (TYPE_COMMENT, NULL);
g_return_val_if_fail (comment, NULL);
return comment;
@@ -999,10 +999,10 @@
*-------------------------------------------------------------------
*/
-guint
+GType
comment_get_type (void)
{
- static guint comment_type = 0;
+ static GType comment_type = 0;
if (!comment_type)
{

26
graphics/pornview/files/patch-comment.h
View File

@ -1,26 +0,0 @@
--- src/comment.h.orig 2002-12-22 11:18:51.000000000 +0100
+++ src/comment.h 2009-04-19 14:34:10.000000000 +0200
@@ -18,10 +18,10 @@
#include "image_info.h"
#define TYPE_COMMENT (comment_get_type ())
-#define COMMENT(obj) (GTK_CHECK_CAST ((obj), TYPE_COMMENT, Comment))
-#define COMMENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_COMMENT, CommentClass))
-#define IS_COMMENT(obj) (GTK_CHECK_TYPE ((obj), TYPE_COMMENT))
-#define IS_COMMENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_COMMENT))
+#define COMMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMENT, Comment))
+#define COMMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COMMENT, CommentClass))
+#define IS_COMMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_COMMENT))
+#define IS_COMMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_COMMENT))
typedef struct Comment_Tag Comment;
typedef struct CommentClass_Tag CommentClass;
@@ -64,7 +64,7 @@
CommentDataEntry;
-guint comment_get_type (void);
+GType comment_get_type (void);
Comment *comment_ref (Comment * comment);
void comment_unref (Comment * comment);

25
graphics/pornview/files/patch-gtkcellrendererpixmap.c
View File

@ -1,25 +0,0 @@
--- src/support/widgets/gtkcellrendererpixmap.c.orig 2002-12-13 12:02:45.000000000 +0100
+++ src/support/widgets/gtkcellrendererpixmap.c 2009-04-19 17:20:36.000000000 +0200
@@ -12,9 +12,6 @@
* Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
*/
-#ifndef GTK_DISABLE_DEPRECATED
-#define GTK_DISABLE_DEPRECATED
-#endif /* GTK_DISABLE_DEPRECATED */
#include "gtkcellrendererpixmap.h"
@@ -59,10 +56,10 @@
PROP_MASK_EXPANDER_CLOSED
};
-GtkType
+GType
gtk_cell_renderer_pixmap_get_type (void)
{
- static GtkType cell_pixmap_type = 0;
+ static GType cell_pixmap_type = 0;
if (!cell_pixmap_type)
{

28
graphics/pornview/files/patch-gtkcellrendererpixmap.h
View File

@ -1,28 +0,0 @@
--- src/support/widgets/gtkcellrendererpixmap.h.orig 2002-12-13 12:02:45.000000000 +0100
+++ src/support/widgets/gtkcellrendererpixmap.h 2009-04-19 13:58:55.000000000 +0200
@@ -32,11 +32,11 @@
#define GTK_TYPE_CELL_RENDERER_PIXMAP (gtk_cell_renderer_pixmap_get_type ())
-#define GTK_CELL_RENDERER_PIXMAP(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmap))
-#define GTK_CELL_RENDERER_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
-#define GTK_IS_CELL_RENDERER_PIXMAP(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP))
-#define GTK_IS_CELL_RENDERER_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP))
-#define GTK_CELL_RENDERER_PIXMAP_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
+#define GTK_CELL_RENDERER_PIXMAP(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmap))
+#define GTK_CELL_RENDERER_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
+#define GTK_IS_CELL_RENDERER_PIXMAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP))
+#define GTK_IS_CELL_RENDERER_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP))
+#define GTK_CELL_RENDERER_PIXMAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
typedef struct GtkCellRendererPixmap_Tag GtkCellRendererPixmap;
typedef struct GtkCellRendererPixmapClass_Tag GtkCellRendererPixmapClass;
@@ -66,7 +66,7 @@
void (*_gtk_reserved4) (void);
};
- GtkType gtk_cell_renderer_pixmap_get_type (void);
+ GType gtk_cell_renderer_pixmap_get_type (void);
GtkCellRenderer *gtk_cell_renderer_pixmap_new (void);
#ifdef __cplusplus

74
graphics/pornview/files/patch-gtkmplayer.c
View File

@ -1,74 +0,0 @@
--- src/support/widgets/gtkmplayer.c.orig Fri Dec 13 12:15:21 2002
+++ src/support/widgets/gtkmplayer.c Sat May 17 15:04:45 2003
@@ -30,6 +30,7 @@
#include <errno.h>
#include <ctype.h>
#include <math.h>
+#include <signal.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
@@ -72,9 +73,9 @@
int stderr_fd;
int stdin_fd;
- gchar stdout[GTK_MPLAYER_BUF_SIZE];
+ gchar stdoutb[GTK_MPLAYER_BUF_SIZE];
gint stdout_size;
- gchar stderr[GTK_MPLAYER_BUF_SIZE];
+ gchar stderrb[GTK_MPLAYER_BUF_SIZE];
gint stderr_size;
ProcessLineFunc process_line_fn;
@@ -1049,13 +1050,13 @@
context->stdout_fd = out_fd[0];
fcntl (context->stdout_fd, F_SETFL, O_NONBLOCK);
close (out_fd[1]);
- context->stdout[0] = '\0';
+ context->stdoutb[0] = '\0';
context->stdout_size = 0;
context->stderr_fd = err_fd[0];
fcntl (context->stderr_fd, F_SETFL, O_NONBLOCK);
close (err_fd[1]);
- context->stderr[0] = '\0';
+ context->stderrb[0] = '\0';
context->stderr_size = 0;
context->stdin_fd = in_fd[1];
@@ -1193,7 +1194,7 @@
if (size > 0 && size < GTK_MPLAYER_BUF_SIZE)
{
- memcpy (buf, context->stderr, size);
+ memcpy (buf, context->stderrb, size);
next = buf + size;
}
else
@@ -1211,7 +1212,7 @@
size += MIN (GTK_MPLAYER_BUF_SIZE - 1, n);
process_lines (context, buf, size,
- context->stderr, &context->stderr_size, TRUE);
+ context->stderrb, &context->stderr_size, TRUE);
}
/*
@@ -1221,7 +1222,7 @@
if (size > 0 && size < GTK_MPLAYER_BUF_SIZE)
{
- memcpy (buf, context->stdout, size);
+ memcpy (buf, context->stdoutb, size);
next = buf + size;
}
else
@@ -1240,7 +1241,7 @@
pos = context->player->pos;
process_lines (context, buf, size,
- context->stdout, &context->stdout_size, FALSE);
+ context->stdoutb, &context->stdout_size, FALSE);
if (fabs (context->player->pos - pos) > 0.1)
gtk_signal_emit (GTK_OBJECT (context->player),

129
graphics/pornview/files/patch-gtkxine.c
View File

@ -1,129 +0,0 @@
--- src/support/widgets/gtkxine.c.orig
+++ src/support/widgets/gtkxine.c
@@ -244,13 +244,21 @@ frame_output_cb (void *gxine_gen,
*dest_pixel_aspect = video_pixel_aspect * gxine->display_ratio;
}
+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
static xine_vo_driver_t *
+#else
+static xine_video_port_t *
+#endif
load_video_out_driver (GtkXine * this)
{
double res_h, res_v;
x11_visual_t vis;
const char *video_driver_id;
+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
xine_vo_driver_t *vo_driver;
+#else
+ xine_video_port_t *vo_driver;
+#endif
vis.display = this->display;
vis.screen = this->screen;
@@ -296,10 +304,18 @@ load_video_out_driver (GtkXine * this)
XINE_VISUAL_TYPE_X11, (void *) &vis);
}
+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
static xine_ao_driver_t *
+#else
+static xine_audio_port_t *
+#endif
load_audio_out_driver (GtkXine * this)
{
+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
xine_ao_driver_t *ao_driver;
+#else
+ xine_audio_port_t *ao_driver;
+#endif
const char *audio_driver_id;
/*
@@ -354,8 +370,13 @@ xine_thread (void *this_gen)
if (event.xexpose.count != 0)
break;
+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
xine_gui_send_vo_data (this->stream,
- XINE_GUI_SEND_EXPOSE_EVENT, &event);
+ XINE_GUI_SEND_EXPOSE_EVENT, &event);
+#else
+ xine_port_send_gui_data (this->vo_driver,
+ XINE_GUI_SEND_EXPOSE_EVENT, &event);
+#endif
break;
case FocusIn: /* happens only in fullscreen mode */
@@ -368,8 +389,13 @@ xine_thread (void *this_gen)
if (event.type == this->completion_event)
{
+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
xine_gui_send_vo_data (this->stream,
XINE_GUI_SEND_COMPLETION_EVENT, &event);
+#else
+ xine_port_send_gui_data (this->vo_driver,
+ XINE_GUI_SEND_EXPOSE_EVENT, &event);
+#endif
/*
* printf ("gtkxine: completion event\n");
*/
@@ -632,7 +658,7 @@ gtk_xine_unrealize (GtkWidget * widget)
*/
if (this->vo_driver != NULL)
xine_close_video_driver (this->xine, this->vo_driver);
- if (this->vo_driver != NULL)
+ if (this->ao_driver != NULL)
xine_close_audio_driver (this->xine, this->ao_driver);
/*
@@ -748,6 +774,7 @@ gtk_xine_play (GtkXine * gtx, gint pos,
return retval;
}
+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
gint
gtk_xine_trick_mode (GtkXine * gtx, gint mode, gint value)
{
@@ -757,6 +784,7 @@ gtk_xine_trick_mode (GtkXine * gtx, gint
return xine_trick_mode (gtx->stream, mode, value);
}
+#endif
gint
gtk_xine_get_pos_length (GtkXine * gtx, gint * pos_stream,
@@ -1001,9 +1029,15 @@ gtk_xine_set_fullscreen (GtkXine * gtx,
gtx->toplevel, RevertToNone, CurrentTime);
XMoveWindow (gtx->display, gtx->fullscreen_window, 0, 0);
+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
xine_gui_send_vo_data (gtx->stream,
XINE_GUI_SEND_DRAWABLE_CHANGED,
(void *) gtx->fullscreen_window);
+#else
+ xine_port_send_gui_data (gtx->vo_driver,
+ XINE_GUI_SEND_DRAWABLE_CHANGED,
+ (void *) gtx->fullscreen_window);
+#endif
/*
* switch off mouse cursor
@@ -1014,9 +1048,15 @@ gtk_xine_set_fullscreen (GtkXine * gtx,
}
else
{
+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
xine_gui_send_vo_data (gtx->stream,
XINE_GUI_SEND_DRAWABLE_CHANGED,
(void *) gtx->video_window);
+#else
+ xine_port_send_gui_data (gtx->vo_driver,
+ XINE_GUI_SEND_DRAWABLE_CHANGED,
+ (void *) gtx->video_window);
+#endif
XDestroyWindow (gtx->display, gtx->fullscreen_window);
}

24
graphics/pornview/files/patch-gtkxine.h
View File

@ -1,24 +0,0 @@
--- src/support/widgets/gtkxine.h.orig Sat Nov 23 22:56:41 2002
+++ src/support/widgets/gtkxine.h Sat Dec 7 15:09:28 2002
@@ -20,6 +20,7 @@
#ifdef ENABLE_XINE
+#include <pthread.h>
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/extensions/XShm.h>
@@ -56,8 +57,13 @@ extern "C"
xine_event_queue_t *event_queue;
char configfile[256];
+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
xine_vo_driver_t *vo_driver;
xine_ao_driver_t *ao_driver;
+#else
+ xine_video_port_t *vo_driver;
+ xine_audio_port_t *ao_driver;
+#endif
x11_visual_t vis;
double display_ratio;
Display *display;

29
graphics/pornview/files/patch-image_loader.c
View File

@ -1,29 +0,0 @@
--- src/support/image_loader.c.orig 2002-12-16 18:45:36.000000000 +0100
+++ src/support/image_loader.c 2009-04-19 13:58:56.000000000 +0200
@@ -81,7 +81,7 @@
image_loader_stop (ImageLoader * il)
{
#ifdef USE_GTK2
- GError *err;
+ GError *err = NULL;
#endif
if (!il)
@@ -174,7 +174,7 @@
gint c;
#ifdef USE_GTK2
- GError *err;
+ GError *err = NULL;
#endif
if (!il)
@@ -241,7 +241,7 @@
int b;
#ifdef USE_GTK2
- GError *err;
+ GError *err = NULL;
#endif
if (!il->loader || il->pixbuf)

19
graphics/pornview/files/patch-pixbuf_utils.c
View File

@ -1,19 +0,0 @@
--- src/support/pixbuf_utils.c.orig 2002-12-13 13:29:28.000000000 +0100
+++ src/support/pixbuf_utils.c 2012-05-09 12:38:26.000000000 +0200
@@ -18,6 +18,7 @@
#endif
#include <png.h>
+#include <pngpriv.h>
#include <gtk/gtk.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
@@ -60,7 +61,7 @@
return FALSE;
}
- if (setjmp (png_ptr->jmpbuf))
+ if (setjmp (png_jmpbuf(png_ptr)))
{
png_destroy_write_struct (&png_ptr, &info_ptr);
fclose (handle);

12
graphics/pornview/files/patch-zlist.c
View File

@ -1,12 +0,0 @@
--- src/support/widgets/zlist.c.orig 2002-12-13 11:52:56.000000000 +0100
+++ src/support/widgets/zlist.c 2009-04-19 13:58:56.000000000 +0200
@@ -634,7 +634,8 @@
CELL_X_FROM_COL (list, j), area->y,
list->cell_x_pad, area->height);
- cell = ZLIST_CELL_FROM_INDEX (list, idx);
+ if (idx < list->cell_count)
+ cell = ZLIST_CELL_FROM_INDEX (list, idx);
cell_area.x = CELL_X_FROM_COL (list, j) + list->cell_x_pad;
cell_area.y = CELL_Y_FROM_ROW (list, i) + list->cell_y_pad;

10
graphics/pornview/pkg-descr
View File

@ -1,10 +0,0 @@
PornView is an image viewer/manager
Features:
- Thumbnail list display.
- Thumbnails can be cached to disk for faster subsequent loads.
- Zoom in, out, and fit to window.
- Slideshow.
- Full screen viewing.
WWW: http://pornview.sourceforge.net

6
graphics/pornview/pkg-plist
View File

@ -1,6 +0,0 @@
bin/pornview
share/gnome/apps/Graphics/pornview.desktop
share/pixmaps/pornview.png
%%NLS%%share/locale/fr/LC_MESSAGES/pornview.mo
%%NLS%%share/locale/pl/LC_MESSAGES/pornview.mo
share/pornview/scripts/helloworld