the big gnome24 (2.4.1+) update git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1943 c5f82cb5-29bc-0310-9cd0-bff59a50e3bcrocklinux
@ -0,0 +1,106 @@ |
|||||
|
--- dia-0.92.2/configure.orig 2003-11-18 11:57:25.000000000 +0100
|
||||
|
+++ dia-0.92.2/configure 2003-11-18 18:33:27.000000000 +0100
|
||||
|
@@ -20979,41 +20979,42 @@
|
||||
|
png_ok=no |
||||
|
fi |
||||
|
|
||||
|
-if test "$png_ok" = yes; then
|
||||
|
- echo "$as_me:$LINENO: checking for png_structp in png.h" >&5
|
||||
|
-echo $ECHO_N "checking for png_structp in png.h... $ECHO_C" >&6
|
||||
|
- old_LDFLAGS="${LDFLAGS}"
|
||||
|
- LDFLAGS="${LDFLAGS} -lz -lm"
|
||||
|
- cat >conftest.$ac_ext <<_ACEOF
|
||||
|
-#include <png.h>
|
||||
|
- png_structp pp;
|
||||
|
- png_infop info;
|
||||
|
- png_colorp cmap;
|
||||
|
- main() { void*foo = png_create_read_struct; }
|
||||
|
-_ACEOF
|
||||
|
-rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
|
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
|
- (eval $ac_link) 2>&5
|
||||
|
- ac_status=$?
|
||||
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
|
- (exit $ac_status); } &&
|
||||
|
- { ac_try='test -s conftest$ac_exeext'
|
||||
|
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
|
- (eval $ac_try) 2>&5
|
||||
|
- ac_status=$?
|
||||
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
|
- (exit $ac_status); }; }; then
|
||||
|
- png_ok=yes
|
||||
|
-else
|
||||
|
- echo "$as_me: failed program was:" >&5
|
||||
|
-sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
-
|
||||
|
-png_ok=no
|
||||
|
-fi
|
||||
|
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
|
- LDFLAGS="${old_LDFLAGS}"
|
||||
|
- echo "$as_me:$LINENO: result: $png_ok" >&5
|
||||
|
-echo "${ECHO_T}$png_ok" >&6
|
||||
|
+# if test "$png_ok" = yes; then
|
||||
|
+# echo "$as_me:$LINENO: checking for png_structp in png.h" >&5
|
||||
|
+# echo $ECHO_N "checking for png_structp in png.h... $ECHO_C" >&6
|
||||
|
+# old_LDFLAGS="${LDFLAGS}"
|
||||
|
+# LDFLAGS="${LDFLAGS} -lz -lm"
|
||||
|
+# cat >conftest.$ac_ext <<_ACEOF
|
||||
|
+# #include <png.h>
|
||||
|
+# png_structp pp;
|
||||
|
+# png_infop info;
|
||||
|
+# png_colorp cmap;
|
||||
|
+# main() { void*foo = png_create_read_struct; }
|
||||
|
+# _ACEOF
|
||||
|
+# rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
|
+# if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
|
+# (eval $ac_link) 2>&5
|
||||
|
+# ac_status=$?
|
||||
|
+# echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
|
+# (exit $ac_status); } &&
|
||||
|
+# { ac_try='test -s conftest$ac_exeext'
|
||||
|
+# { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
|
+# (eval $ac_try) 2>&5
|
||||
|
+# ac_status=$?
|
||||
|
+# echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
|
+# (exit $ac_status); }; }; then
|
||||
|
+# png_ok=yes
|
||||
|
+# else
|
||||
|
+# echo "$as_me: failed program was:" >&5
|
||||
|
+# sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
+
|
||||
|
+# png_ok=no
|
||||
|
+# fi
|
||||
|
+
|
||||
|
+#rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
|
+# LDFLAGS="${old_LDFLAGS}"
|
||||
|
+# echo "$as_me:$LINENO: result: $png_ok" >&5
|
||||
|
+#echo "${ECHO_T}$png_ok" >&6
|
||||
|
if test "$png_ok" = yes; then |
||||
|
PNG_LIBS='-lpng -lz -lm' |
||||
|
|
||||
|
@@ -21022,7 +21023,7 @@
|
||||
|
_ACEOF |
||||
|
|
||||
|
fi |
||||
|
-fi
|
||||
|
+#fi
|
||||
|
|
||||
|
|
||||
|
LIBS="${old_LIBS} ${PNG_LIBS}" |
||||
|
@@ -23431,7 +23432,7 @@
|
||||
|
|
||||
|
|
||||
|
if test -z "$PYTHON"; then |
||||
|
- for ac_prog in python python2.1 python2.0 python1.6 python1.5
|
||||
|
+ for ac_prog in python python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
|
||||
|
do |
||||
|
# Extract the first word of "$ac_prog", so it can be a program name with args. |
||||
|
set dummy $ac_prog; ac_word=$2 |
||||
|
@@ -23546,7 +23547,6 @@
|
||||
|
echo "$as_me:$LINENO: result: looks good" >&5 |
||||
|
echo "${ECHO_T}looks good" >&6 |
||||
|
|
||||
|
-
|
||||
|
py_mod_var=`echo gtk'_' | sed 'y%./+-%__p_%'` |
||||
|
echo "$as_me:$LINENO: checking for python module gtk" >&5 |
||||
|
echo $ECHO_N "checking for python module gtk... $ECHO_C" >&6 |
@ -0,0 +1,14 @@ |
|||||
|
diff -urN -X ../scripts/old/dontdiff gDesklets-0.24.1/tools/Makefile.in gDesklets-0.24.1-libs-fix/tools/Makefile.in
|
||||
|
--- gDesklets-0.24.1/tools/Makefile.in 2003-11-10 21:28:26.000000000 +0100
|
||||
|
+++ gDesklets-0.24.1-libs-fix/tools/Makefile.in 2003-12-02 16:13:25.000000000 +0100
|
||||
|
@@ -193,7 +193,9 @@
|
||||
|
bin_PROGRAMS = gdesklets-display-thumbnailer |
||||
|
|
||||
|
gdesklets_display_thumbnailer_SOURCES = gdesklets-display-thumbnailer.c |
||||
|
-gdesklets_display_thumbnailer_LDADD = -lglib-2.0 -lgnomevfs-2
|
||||
|
+gdesklets_display_thumbnailer_LDADD = `pkg-config --libs glib-2.0 gnome-vfs-module-2.0`
|
||||
|
+
|
||||
|
+
|
||||
|
subdir = tools |
||||
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
||||
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
@ -0,0 +1,11 @@ |
|||||
|
--- gedit-plugins-2.3.5/plugins/diff/diff.c.orig 2003-12-02 13:05:30.000000000 +0100
|
||||
|
+++ gedit-plugins-2.3.5/plugins/diff/diff.c 2003-12-02 13:05:33.000000000 +0100
|
||||
|
@@ -959,7 +959,7 @@
|
||||
|
|
||||
|
temp = gedit_plugin_locate_program (DIFF_PROGRAM_NAME, |
||||
|
plugin_name, |
||||
|
- parent);
|
||||
|
+ parent, NULL, NULL);
|
||||
|
|
||||
|
if (temp != NULL) |
||||
|
{ |
@ -0,0 +1,11 @@ |
|||||
|
--- gnomemeeting-0.98.5/lib/xdap/xdap.c.orig 2003-12-02 14:43:58.000000000 +0100
|
||||
|
+++ gnomemeeting-0.98.5/lib/xdap/xdap.c 2003-12-02 14:47:13.000000000 +0100
|
||||
|
@@ -156,7 +156,7 @@
|
||||
|
xmlEntityPtr (**oldgetent) (void *, const xmlChar *), int noerr) |
||||
|
{ |
||||
|
xmlDocPtr xp; |
||||
|
- xmlSAXHandler sax;
|
||||
|
+ xmlSAXHandlerV1 sax;
|
||||
|
|
||||
|
memset (&sax, 0, sizeof sax); |
||||
|
sax = xmlDefaultSAXHandler; /* Copy original handler */ |
@ -0,0 +1,40 @@ |
|||||
|
diff -urN gst-plugins-0.7.1/ext/xvid/gstxvid.h gst-plugins-0.7.1-new/ext/xvid/gstxvid.h
|
||||
|
--- gst-plugins-0.7.1/ext/xvid/gstxvid.h 1970-01-01 01:00:00.000000000 +0100
|
||||
|
+++ gst-plugins-0.7.1-new/ext/xvid/gstxvid.h 2003-11-21 00:58:34.000000000 +0100
|
||||
|
@@ -0,0 +1,36 @@
|
||||
|
+/* GStreamer xvid decoder plugin
|
||||
|
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
|
||||
|
+ *
|
||||
|
+ * This library is free software; you can redistribute it and/or
|
||||
|
+ * modify it under the terms of the GNU Library General Public
|
||||
|
+ * License as published by the Free Software Foundation; either
|
||||
|
+ * version 2 of the License, or (at your option) any later version.
|
||||
|
+ *
|
||||
|
+ * This library is distributed in the hope that it will be useful,
|
||||
|
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
|
+ * Library General Public License for more details.
|
||||
|
+ *
|
||||
|
+ * You should have received a copy of the GNU Library General Public
|
||||
|
+ * License along with this library; if not, write to the
|
||||
|
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
|
+ * Boston, MA 02111-1307, USA.
|
||||
|
+ */
|
||||
|
+
|
||||
|
+#ifndef __GST_XVID_H__
|
||||
|
+#define __GST_XVID_H__
|
||||
|
+
|
||||
|
+#include <gst/gst.h>
|
||||
|
+
|
||||
|
+#ifdef __cplusplus
|
||||
|
+extern "C" {
|
||||
|
+#endif /* __cplusplus */
|
||||
|
+
|
||||
|
+extern gchar * gst_xvid_error (int errorcode);
|
||||
|
+extern gboolean gst_xvid_init (void);
|
||||
|
+
|
||||
|
+#ifdef __cplusplus
|
||||
|
+}
|
||||
|
+#endif /* __cplusplus */
|
||||
|
+
|
||||
|
+#endif /* __GST_XVID_H__ */
|
@ -0,0 +1,20 @@ |
|||||
|
--- gst-plugins-0.6.3/ext/mpeg2dec/gstmpeg2dec.c.orig 2003-11-22 17:55:05.000000000 +0100
|
||||
|
+++ gst-plugins-0.6.3/ext/mpeg2dec/gstmpeg2dec.c 2003-11-22 17:57:19.000000000 +0100
|
||||
|
@@ -262,7 +262,7 @@
|
||||
|
GstBuffer *outbuf = NULL; |
||||
|
gint size = mpeg2dec->width * mpeg2dec->height; |
||||
|
guint8 *buf[3], *out; |
||||
|
- const picture_t *picture;
|
||||
|
+ const mpeg2_picture_t *picture;
|
||||
|
|
||||
|
if (mpeg2dec->peerpool) { |
||||
|
outbuf = gst_buffer_new_from_pool (mpeg2dec->peerpool, 0, 0); |
||||
|
@@ -553,7 +553,7 @@
|
||||
|
(info->display_fbuf ? info->display_fbuf->id : NULL)); |
||||
|
|
||||
|
if (info->display_fbuf && info->display_fbuf->id) { |
||||
|
- const picture_t *picture;
|
||||
|
+ const mpeg2_picture_t *picture;
|
||||
|
gboolean key_frame = FALSE; |
||||
|
|
||||
|
outbuf = (GstBuffer *) info->display_fbuf->id; |
@ -0,0 +1,26 @@ |
|||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/gnome24/gstreamer/gstreamer-pkg.conf |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
||||
|
# |
||||
|
# This program is free software; you can redistribute it and/or modify |
||||
|
# it under the terms of the GNU General Public License as published by |
||||
|
# the Free Software Foundation; either version 2 of the License, or |
||||
|
# (at your option) any later version. A copy of the GNU General Public |
||||
|
# License can be found at Documentation/COPYING. |
||||
|
# |
||||
|
# Many people helped and are helping developing ROCK Linux. Please |
||||
|
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
# file for details. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
# this is generated by /etc/cron.d/81-gstreamer |
||||
|
# because it leads to shared files during build |
||||
|
flistdel="$flistdel|var/.*/gstreamer-.*/registry.xml" |
||||
|
|
@ -0,0 +1,24 @@ |
|||||
|
#!/bin/bash |
||||
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
# |
||||
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
# Please add additional copyright information _after_ the line containing |
||||
|
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
# |
||||
|
# ROCK Linux: rock-src/package/gnome24/gstreamer/gstreamer.cron |
||||
|
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf |
||||
|
# |
||||
|
# This program is free software; you can redistribute it and/or modify |
||||
|
# it under the terms of the GNU General Public License as published by |
||||
|
# the Free Software Foundation; either version 2 of the License, or |
||||
|
# (at your option) any later version. A copy of the GNU General Public |
||||
|
# License can be found at Documentation/COPYING. |
||||
|
# |
||||
|
# Many people helped and are helping developing ROCK Linux. Please |
||||
|
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
# file for details. |
||||
|
# |
||||
|
# --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
/D_prefix/bin/gst-register |
@ -0,0 +1,11 @@ |
|||||
|
--- gtkextra-2-20031116/gtkextra/gtkpsfont.c.orig 2003-11-27 06:25:54.000000000 +0100
|
||||
|
+++ gtkextra-2-20031116/gtkextra/gtkpsfont.c 2003-11-27 06:26:36.000000000 +0100
|
||||
|
@@ -357,7 +357,7 @@
|
||||
|
{ |
||||
|
GList *list; |
||||
|
|
||||
|
- if(psfont_refcont <= 0) return;
|
||||
|
+ if(psfont_refcount <= 0) return;
|
||||
|
|
||||
|
psfont_refcount--; |
||||
|
|