OpenSDE
/
rocklinux
mirror of https://github.com/amery/rocklinux.git
2
0
Fork 0
Code Releases Wiki Activity
Browse Source

This gnome and gtkhtml stuff is even more broken than i thought.... 

Builds fine against the current svn version and the gtkhtml-patch i send in 
the last mail. I've tested it by installing the gtkhtml and gtk-perl packages 
on my system. The test scripts provided by gtk-perl ran fine, even the 
gtkhtml ones.


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1027 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Rene Rebe 23 years ago
parent
3686cc2ad7
commit
24d534ceb5
7 changed files with 321 additions and 1 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      Documentation/Developers/CHANGELOG-RENE
  2. +35
    -0
      package/gnome14/gtk-perl10/gendefs.patch
  3. +164
    -0
      package/gnome14/gtk-perl10/gtk-perl-build.patch
  4. +29
    -0
      package/gnome14/gtk-perl10/gtk-perl10.conf
  5. +41
    -0
      package/gnome14/gtk-perl10/gtk-perl10.desc
  6. +37
    -0
      package/gnome14/gtk-perl10/gtkhtml_fixes.patch
  7. +14
    -0
      package/gnome14/gtk-perl10/lib_versions.patch

+ 1
- 1
Documentation/Developers/CHANGELOG-RENE
View File

@ -4,7 +4,7 @@ whole rxr-tree.
*) 2003-08-05 (2.0.0-beta7 - 2.0.0-rc1)
- Burkhard Linke: fixed kasc/clanlib
- Burkhard Linke: fixed kasc/clanlib, gtk-perl10
*) 2003-08-04 (2.0.0-beta7 - 2.0.0-rc1)

+ 35
- 0
package/gnome14/gtk-perl10/gendefs.patch
View File

@ -0,0 +1,35 @@
# --- 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/gnome2/gtk-perl10/gendefs.patch
# 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 ---
--- ./tools/gendefs.pl~ Tue Mar 9 19:46:14 1999
+++ ./tools/gendefs.pl Tue Apr 27 16:08:13 1999
@@ -517,6 +517,10 @@
#undef _
#endif
+#ifdef dirty
+#undef dirty
+#endif
+
#ifndef Perl${FilePrefix}DeclareFunc
#include "Perl${FilePrefix}Int.h"
#endif

+ 164
- 0
package/gnome14/gtk-perl10/gtk-perl-build.patch
View File

@ -0,0 +1,164 @@
# --- 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/gnome2/gtk-perl10/gtk-perl-build.patch
# 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 ---
diff -ur Gtk-Perl-0.7008/Applet/Makefile.PL Applet/Makefile.PL
--- Gtk-Perl-0.7008/Applet/Makefile.PL Sat Mar 24 10:44:08 2001
+++ Gtk-Perl-0.7008/Applet/Makefile.PL Mon Jul 22 10:20:27 2002
@@ -102,7 +102,7 @@
sub MY::c_o {
package MY; # so that "SUPER" works right
my $inherited = shift->SUPER::c_o(@_);
- $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m;
+ $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/mg;
$inherited;
}
diff -ur Gtk-Perl-0.7008/Bonobo/Makefile.PL Bonobo/Makefile.PL
--- Gtk-Perl-0.7008/Bonobo/Makefile.PL Wed May 30 08:39:05 2001
+++ Gtk-Perl-0.7008/Bonobo/Makefile.PL Mon Jul 22 10:20:17 2002
@@ -96,7 +96,7 @@
sub MY::c_o {
package MY; # so that "SUPER" works right
my $inherited = shift->SUPER::c_o(@_);
- $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m;
+ $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/mg;
$inherited;
}
diff -ur Gtk-Perl-0.7008/GdkImlib/Makefile.PL GdkImlib/Makefile.PL
--- Gtk-Perl-0.7008/GdkImlib/Makefile.PL Fri Mar 23 08:57:07 2001
+++ Gtk-Perl-0.7008/GdkImlib/Makefile.PL Mon Jul 22 10:20:40 2002
@@ -43,6 +43,6 @@
sub MY::c_o {
package MY; # so that "SUPER" works right
my $inherited = shift->SUPER::c_o(@_);
- $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m;
+ $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/mg;
$inherited;
}
diff -ur Gtk-Perl-0.7008/GdkPixbuf/Makefile.PL GdkPixbuf/Makefile.PL
--- Gtk-Perl-0.7008/GdkPixbuf/Makefile.PL Fri Mar 23 08:57:07 2001
+++ Gtk-Perl-0.7008/GdkPixbuf/Makefile.PL Mon Jul 22 10:20:49 2002
@@ -89,6 +89,6 @@
sub MY::c_o {
package MY; # so that "SUPER" works right
my $inherited = shift->SUPER::c_o(@_);
- $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m;
+ $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/mg;
$inherited;
}
diff -ur Gtk-Perl-0.7008/Glade/Makefile.PL Glade/Makefile.PL
--- Gtk-Perl-0.7008/Glade/Makefile.PL Fri Mar 23 08:57:07 2001
+++ Gtk-Perl-0.7008/Glade/Makefile.PL Mon Jul 22 10:20:31 2002
@@ -108,7 +108,7 @@
sub MY::c_o {
package MY; # so that "SUPER" works right
my $inherited = shift->SUPER::c_o(@_);
- $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m;
+ $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/mg;
$inherited;
}
diff -ur Gtk-Perl-0.7008/Gnome/Makefile.PL Gnome/Makefile.PL
--- Gtk-Perl-0.7008/Gnome/Makefile.PL Fri Mar 23 08:57:08 2001
+++ Gtk-Perl-0.7008/Gnome/Makefile.PL Mon Jul 22 10:20:04 2002
@@ -125,7 +125,7 @@
sub MY::c_o {
package MY; # so that "SUPER" works right
my $inherited = shift->SUPER::c_o(@_);
- $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m;
+ $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/mg;
$inherited;
}
diff -ur Gtk-Perl-0.7008/GnomePrint/Makefile.PL GnomePrint/Makefile.PL
--- Gtk-Perl-0.7008/GnomePrint/Makefile.PL Fri Mar 23 08:57:08 2001
+++ Gtk-Perl-0.7008/GnomePrint/Makefile.PL Mon Jul 22 10:20:45 2002
@@ -112,7 +112,7 @@
sub MY::c_o {
package MY; # so that "SUPER" works right
my $inherited = shift->SUPER::c_o(@_);
- $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m;
+ $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/mg;
$inherited;
}
diff -ur Gtk-Perl-0.7008/Gtk/Makefile.PL Gtk/Makefile.PL
--- Gtk-Perl-0.7008/Gtk/Makefile.PL Sat May 26 11:08:38 2001
+++ Gtk-Perl-0.7008/Gtk/Makefile.PL Mon Jul 22 10:12:47 2002
@@ -190,7 +190,7 @@
sub MY::c_o {
package MY; # so that "SUPER" works right
my $inherited = shift->SUPER::c_o(@_);
- $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m;
+ $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/mg;
$inherited;
}
diff -ur Gtk-Perl-0.7008/GtkGLArea/Makefile.PL GtkGLArea/Makefile.PL
--- Gtk-Perl-0.7008/GtkGLArea/Makefile.PL Fri Mar 23 08:57:08 2001
+++ Gtk-Perl-0.7008/GtkGLArea/Makefile.PL Mon Jul 22 10:20:01 2002
@@ -104,7 +104,7 @@
sub MY::c_o {
package MY; # so that "SUPER" works right
my $inherited = shift->SUPER::c_o(@_);
- $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m;
+ $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/mg;
$inherited;
}
diff -ur Gtk-Perl-0.7008/GtkHTML/Makefile.PL GtkHTML/Makefile.PL
--- Gtk-Perl-0.7008/GtkHTML/Makefile.PL Fri Mar 23 08:57:08 2001
+++ Gtk-Perl-0.7008/GtkHTML/Makefile.PL Mon Jul 22 10:20:52 2002
@@ -107,7 +107,7 @@
sub MY::c_o {
package MY; # so that "SUPER" works right
my $inherited = shift->SUPER::c_o(@_);
- $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m;
+ $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/mg;
$inherited;
}
diff -ur Gtk-Perl-0.7008/GtkXmHTML/Makefile.PL GtkXmHTML/Makefile.PL
--- Gtk-Perl-0.7008/GtkXmHTML/Makefile.PL Fri Mar 23 08:57:08 2001
+++ Gtk-Perl-0.7008/GtkXmHTML/Makefile.PL Mon Jul 22 10:20:36 2002
@@ -95,7 +95,7 @@
sub MY::c_o {
package MY; # so that "SUPER" works right
my $inherited = shift->SUPER::c_o(@_);
- $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m;
+ $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/mg;
$inherited;
}
diff -ur Gtk-Perl-0.7008/Mozilla/Makefile.PL Mozilla/Makefile.PL
--- Gtk-Perl-0.7008/Mozilla/Makefile.PL Fri Mar 23 08:57:08 2001
+++ Gtk-Perl-0.7008/Mozilla/Makefile.PL Mon Jul 22 10:20:20 2002
@@ -94,7 +94,7 @@
sub MY::c_o {
package MY; # so that "SUPER" works right
my $inherited = shift->SUPER::c_o(@_);
- $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m;
+ $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/mg;
$inherited;
}

+ 29
- 0
package/gnome14/gtk-perl10/gtk-perl10.conf
View File

@ -0,0 +1,29 @@
# --- 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/gnome2/gtk-perl10/gtk-perl10.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 ---
srcdir="Gtk-Perl-$ver" ; srctar="$srcdir.tar.bz2"
premake="perl Makefile.PL"
# Quick & Dirty hack for the perllocal problem
. $base/package/base/perl5/perllocal_hack.sh

+ 41
- 0
package/gnome14/gtk-perl10/gtk-perl10.desc
View File

@ -0,0 +1,41 @@
[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
[COPY]
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] Please add additional copyright information _after_ the line containing
[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
[COPY]
[COPY] ROCK Linux: rock-src/package/gnome2/gtk-perl10/gtk-perl10.desc
[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
[COPY]
[COPY] This program is free software; you can redistribute it and/or modify
[COPY] it under the terms of the GNU General Public License as published by
[COPY] the Free Software Foundation; either version 2 of the License, or
[COPY] (at your option) any later version. A copy of the GNU General Public
[COPY] License can be found at Documentation/COPYING.
[COPY]
[COPY] Many people helped and are helping developing ROCK Linux. Please
[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
[COPY] file for details.
[COPY]
[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
[I] Perl bindings for GTK+ and GNOME.
[T] Gtk-Perl is a collection of Perl modules that provides an
[T] easy-to-use interface to the GTK+, gnome-libs, libglade,
[T] libgtkglarea, libgdk_imlib, libgtkhtml, and other related libraries.
[A] Ken <kjahds@kjahds.com>
[M] Rene Rebe <rene@rocklinux.org>
[C] extra/development
[L] LGPL
[S] Stable
[V] 0.7008
[P] X -----5---9 485.000
[D] 1665322105 Gtk-Perl-0.7008.tar.gz http://www.gtkperl.org/

+ 37
- 0
package/gnome14/gtk-perl10/gtkhtml_fixes.patch
View File

@ -0,0 +1,37 @@
diff -Nur Gtk-Perl-0.7008/GtkHTML/pkg.defs Gtk-Perl-0.7008.test/GtkHTML/pkg.defs
--- Gtk-Perl-0.7008/GtkHTML/pkg.defs 2001-01-21 12:21:06.000000000 +0100
+++ Gtk-Perl-0.7008.test/GtkHTML/pkg.defs 2003-08-05 20:13:34.000000000 +0200
@@ -61,7 +61,6 @@
(remove-link GTK_HTML_COMMAND_REMOVE_LINK)
(delete GTK_HTML_COMMAND_DELETE)
(delete-back GTK_HTML_COMMAND_DELETE_BACK)
- (set-mark GTK_HTML_COMMAND_SET_MARK)
(disable-selection GTK_HTML_COMMAND_DISABLE_SELECTION)
(bold-on GTK_HTML_COMMAND_BOLD_ON)
(bold-off GTK_HTML_COMMAND_BOLD_OFF)
diff -Nur Gtk-Perl-0.7008/GtkHTML/xs/GtkHTML.xs Gtk-Perl-0.7008.test/GtkHTML/xs/GtkHTML.xs
--- Gtk-Perl-0.7008/GtkHTML/xs/GtkHTML.xs 2001-06-17 18:35:46.000000000 +0200
+++ Gtk-Perl-0.7008.test/GtkHTML/xs/GtkHTML.xs 2003-08-05 20:09:49.000000000 +0200
@@ -122,9 +122,10 @@
RETVAL
void
-gtk_html_set_iframe_parent (html, parent)
+gtk_html_set_iframe_parent (html, parent, dummy)
Gtk::HTML html
Gtk::Widget parent
+ void* dummy
gulong
gtk_html_begin (html)
@@ -167,8 +168,9 @@
bool allow
int
-gtk_html_request_paste (html, type, time)
+gtk_html_request_paste (html, dummy, type, time)
Gtk::HTML html
+ void* dummy
int type
int time

+ 14
- 0
package/gnome14/gtk-perl10/lib_versions.patch
View File

@ -0,0 +1,14 @@
--- ./Makefile.PL.orig 2003-08-05 20:00:52.000000000 +0200
+++ ./Makefile.PL 2003-08-05 20:01:29.000000000 +0200
@@ -22,9 +22,9 @@
check => sub {ccompile('#include <gtkgl/gtkglarea.h>', "", `gtk-config --cflags`,
"-lgtkgl -lGL -lGLU " . `gtk-config --libs`)}},
gdkpixbuf => {order => 2, dir => 'GdkPixbuf', depends => [qw(gtk)],
- check => sub {cconfig('gdk-pixbuf-config --version', '0\.(8|9|1\d)\.?')}},
+ check => sub {cconfig('gdk-pixbuf-config --version', '0\.(2|8|9|1\d)\.?')}},
gtkhtml => {order => 2, dir => 'GtkHTML', depends => [qw(gtk)],
- check => sub {cconfig('gnome-config --modversion gtkhtml', 'gtkhtml-0\.[89]')}},
+ check => sub {cconfig('gnome-config --modversion gtkhtml', 'gtkhtml-((1\.0)|(0\.[89]))')}},
gtkxmhtml => {order => 2, dir => 'GtkXmHTML', depends => [qw(gtk)],
check => sub {cconfig('gnome-config --libs gtkxmhtml', '-lgtkxmhtml')}},
gnome => {order => 3, dir => 'Gnome', depends => [qw(gdkimlib)],

Write Preview
Loading…
Cancel
Save