aboutsummaryrefslogtreecommitdiff
path: root/x11-fm/jafm
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>2000-02-27 14:42:55 +0000
committerSteve Price <steve@FreeBSD.org>2000-02-27 14:42:55 +0000
commitdff5f095189d35655ad74ddfeec4cc4c639cb5f9 (patch)
tree39bb9ce45fb0c312e9faa6dd754deb786140b7bc /x11-fm/jafm
parenta3185354fa411bfb848f44a25822de37ecd218c7 (diff)
downloadports-dff5f095189d35655ad74ddfeec4cc4c639cb5f9.tar.gz
ports-dff5f095189d35655ad74ddfeec4cc4c639cb5f9.zip
Fix for new compiler in -current.
Notes
Notes: svn path=/head/; revision=26356
Diffstat (limited to 'x11-fm/jafm')
-rw-r--r--x11-fm/jafm/files/patch-ab11
-rw-r--r--x11-fm/jafm/files/patch-ac21
-rw-r--r--x11-fm/jafm/files/patch-ad37
-rw-r--r--x11-fm/jafm/files/patch-ae20
-rw-r--r--x11-fm/jafm/files/patch-af11
5 files changed, 100 insertions, 0 deletions
diff --git a/x11-fm/jafm/files/patch-ab b/x11-fm/jafm/files/patch-ab
new file mode 100644
index 000000000000..e3db750d4a1f
--- /dev/null
+++ b/x11-fm/jafm/files/patch-ab
@@ -0,0 +1,11 @@
+--- icon.cc.orig Sat Feb 26 19:38:06 2000
++++ icon.cc Sat Feb 26 19:38:17 2000
+@@ -914,7 +914,7 @@
+ instructions = 0 ;
+ realSize = 0 ;
+
+- static bug = 0 ;
++ static int bug = 0 ;
+
+ // okay, parse the file
+ // error checking is s.e.p.
diff --git a/x11-fm/jafm/files/patch-ac b/x11-fm/jafm/files/patch-ac
new file mode 100644
index 000000000000..fdd0b05927a6
--- /dev/null
+++ b/x11-fm/jafm/files/patch-ac
@@ -0,0 +1,21 @@
+--- zicon.y.orig Wed Sep 24 00:09:52 1997
++++ zicon.y Sat Feb 26 19:51:35 2000
+@@ -3,6 +3,7 @@
+ /* we pass a pointer to the painter into the */
+ #define YYPARSE_PARAM p
+
++#include <stdlib.h>
+ #include "icon.hh"
+
+ #define PROGRAM ((IconProgram *)p)
+@@ -13,6 +14,10 @@
+ int bufAlloc = 160 ;
+ short int *buffer = new short int[bufAlloc] ;
+
++extern int yyerror(char *);
++extern "C" {
++ extern int yylex(void);
++};
+
+ %}
+
diff --git a/x11-fm/jafm/files/patch-ad b/x11-fm/jafm/files/patch-ad
new file mode 100644
index 000000000000..b943d62fa800
--- /dev/null
+++ b/x11-fm/jafm/files/patch-ad
@@ -0,0 +1,37 @@
+--- icondesk.cc.orig Sat Feb 26 19:43:45 2000
++++ icondesk.cc Sat Feb 26 19:45:22 2000
+@@ -29,6 +29,7 @@
+ #include <iostream.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <ctype.h>
+ #include <errno.h>
+ #include <dirent.h>
+
+@@ -526,7 +527,7 @@
+ it.current()->set_embossed (false) ;
+ }
+
+- dragDropIcon->drag_drop_action (dic_list) ; // do it
++ dragDropIcon->drag_drop_action ((QListT<DeskIcon> &)dic_list) ; // do it
+ unHighlightDragDrop () ;
+
+ emit signal_refresh () ; // unnecessary, but can make things look zippier
+@@ -831,7 +832,7 @@
+ // ok, now has a file been added?
+
+ dir_pointer = opendir (".") ;
+- while (dp = readdir (dir_pointer)) {
++ while ((dp = readdir (dir_pointer))) {
+ if (!strcmp (".", dp->d_name) ||
+ !strcmp ("..", dp->d_name))
+ continue ;
+@@ -925,7 +926,7 @@
+ QListIterator<Icon> it (*icon_list) ;
+ for ( ; it.current() ; ++it) {
+ if (it.current()->get_label() == f.fileName()) {
+- it.current()->new_file_info (newf) ;
++ it.current()->new_file_info ((QFileInfo &)newf) ;
+ single_repaint (it.current()) ;
+ return ;
+ }
diff --git a/x11-fm/jafm/files/patch-ae b/x11-fm/jafm/files/patch-ae
new file mode 100644
index 000000000000..2693a1d83e4c
--- /dev/null
+++ b/x11-fm/jafm/files/patch-ae
@@ -0,0 +1,20 @@
+--- deskicon.cc.orig Sat Feb 26 19:45:43 2000
++++ deskicon.cc Sat Feb 26 19:46:48 2000
+@@ -90,7 +90,7 @@
+ ShapeSet) ;
+ // setGeometry (icon->rect()) ; // Qt doesn't know we used XShape!
+ // make room for label
+- QRect *r = &icon->get_label_rect () ;
++ QRect *r = (QRect *)&icon->get_label_rect () ;
+ QBitmap bm (r->width(), r->height()) ;
+ QPainter p (&bm) ;
+ p.fillRect (0,0,r->width(),r->height(), color1) ;
+@@ -177,7 +177,7 @@
+ {
+ // if WId is us, act accordingly
+ if (winId() == w) {
+- icon->drag_drop_action (diList) ;
++ icon->drag_drop_action ((QListT<DeskIcon> &)diList) ;
+ icon->set_drag_drop (false) ;
+ repaint () ;
+ }
diff --git a/x11-fm/jafm/files/patch-af b/x11-fm/jafm/files/patch-af
new file mode 100644
index 000000000000..cfe921532620
--- /dev/null
+++ b/x11-fm/jafm/files/patch-af
@@ -0,0 +1,11 @@
+--- sfm.hh.orig Sat Feb 26 19:36:10 2000
++++ sfm.hh Sat Feb 26 19:48:53 2000
+@@ -59,7 +59,7 @@
+
+ void slot_refresh () ;
+
+- void dragPointAt (const QPoint &p, const QList<DeskIcon> & =0) ;
++ void dragPointAt (const QPoint &p, const QList<DeskIcon> &) ;
+ void dragDropRelease (const QPoint &, const QList<DeskIcon> &) ;
+
+ } ;