sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unbreak by fixing the build with gcc 3.4

Browse source 
No objections by: maintainer
This commit is contained in:
Markus Brueffer 2005-04-24 10:43:59 +00:00
parent 16c2cc0b57
commit 6df720d572
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=134044
12 changed files with 284 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ports-mgmt/barry/Makefile
View file

@ -23,16 +23,12 @@ USE_KDELIBS_VER=3
USE_REINPLACE= yes
GNU_CONFIGURE= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 502126
BROKEN= "Does not compile on FreeBSD >= 5.x"
.endif
pre-build:
${REINPLACE_CMD} "s,-pthread,${PTHREAD_LIBS},g" ${WRKSRC}/Makefile
post-patch:
@${FIND} ${WRKSRC} -name "*.h" -and -not -name "linklocator.h" | \
${XARGS} ${REINPLACE_CMD} -e 's/^};/}/g'
@${REINPLACE_CMD} "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
pre-install:
${MKDIR} ${DESTDIR}${PREFIX}/share/applnk/Utilities
@${MKDIR} ${DESTDIR}${PREFIX}/share/applnk/Utilities
.include <bsd.port.post.mk>
.include <bsd.port.mk>

11
ports-mgmt/barry/files/patch-Makefile.in Normal file
View file

@ -0,0 +1,11 @@
--- src/Makefile.in.orig Sun Apr 24 02:27:28 2005
+++ src/Makefile.in Sun Apr 24 02:27:43 2005
@@ -240,7 +240,7 @@
INCLUDES = $(all_includes)
barry_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-barry_LDADD = $(LIB_KIO) $(LIB_KHTML)
+barry_LDADD = $(LIB_KIO) $(LIB_KHTML) $(LIBPTHREAD)
barry_SOURCES = actionprogressdialog.cc application.cc configdialog.cc \
databaseinfodialog.cc databasewrapper.cc dependlistview.cc \

92
ports-mgmt/barry/files/patch-history.h Normal file
View file

@ -0,0 +1,92 @@
--- src/history.h.bak Sun Jun 8 22:09:10 2003
+++ src/history.h Sun Apr 24 02:18:42 2005
@@ -22,44 +22,7 @@
namespace Barry
{
- class History;
-
- class Command
- {
- public:
- enum CreationFlags {
- None = 0x0, Run = 0x1, Register = 0x2
- };
- virtual ~Command();
-
- template <class T>
- static T *create( CreationFlags flags = None )
- {
- T *cmd = new T;
- if ( flags & Register )
- History::self().registerCommand( cmd );
- if ( flags & Run )
- cmd->exec();
- return cmd;
- }
-
- void unexec();
- void exec();
- virtual QString text() const = 0;
-
- protected:
- Command();
- bool executed() const { return m_executed; }
-
- private:
- Command( const Command &rhs );
- Command &operator=( const Command &rhs );
-
- virtual void doExec() = 0;
- virtual void doUnexec() = 0;
-
- bool m_executed;
- };
+ class Command;
class History : public QObject
{
@@ -100,6 +63,43 @@
unsigned int m_maxEntries;
KToolBarPopupAction *m_backAction;
KToolBarPopupAction *m_forwardAction;
+ };
+
+ class Command
+ {
+ public:
+ enum CreationFlags {
+ None = 0x0, Run = 0x1, Register = 0x2
+ };
+ virtual ~Command();
+
+ template <class T>
+ static T *create( CreationFlags flags = None )
+ {
+ T *cmd = new T;
+ if ( flags & Register )
+ History::self().registerCommand( cmd );
+ if ( flags & Run )
+ cmd->exec();
+ return cmd;
+ }
+
+ void unexec();
+ void exec();
+ virtual QString text() const = 0;
+
+ protected:
+ Command();
+ bool executed() const { return m_executed; }
+
+ private:
+ Command( const Command &rhs );
+ Command &operator=( const Command &rhs );
+
+ virtual void doExec() = 0;
+ virtual void doUnexec() = 0;
+
+ bool m_executed;
};
};

11
ports-mgmt/barry/files/patch-orphanedfilesdialog.cc Normal file
View file

@ -0,0 +1,11 @@
--- src/orphanedfilesdialog.cc.orig Sun Apr 24 02:21:02 2005
+++ src/orphanedfilesdialog.cc Sun Apr 24 02:21:10 2005
@@ -52,7 +52,7 @@
++i;
return i;
}
-};
+}
using namespace Barry;

11
ports-mgmt/barry/files/patch-port.cc Normal file
View file

@ -0,0 +1,11 @@
--- src/port.cc.orig Sun Apr 24 02:21:49 2005
+++ src/port.cc Sun Apr 24 02:21:55 2005
@@ -64,7 +64,7 @@
QString m_link;
long long m_size;
};
-};
+}
// This would be nice in Qt
template <class Container>

11
ports-mgmt/barry/files/patch-portlistview.cc Normal file
View file

@ -0,0 +1,11 @@
--- src/portlistview.cc.orig Sun Apr 24 02:22:33 2005
+++ src/portlistview.cc Sun Apr 24 02:22:41 2005
@@ -42,7 +42,7 @@
QListViewItem *m_oldItem;
QListViewItem *m_newItem;
};
-};
+}
using namespace Barry;

16
sysutils/barry/Makefile
View file

@ -23,16 +23,12 @@ USE_KDELIBS_VER=3
USE_REINPLACE= yes
GNU_CONFIGURE= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 502126
BROKEN= "Does not compile on FreeBSD >= 5.x"
.endif
pre-build:
${REINPLACE_CMD} "s,-pthread,${PTHREAD_LIBS},g" ${WRKSRC}/Makefile
post-patch:
@${FIND} ${WRKSRC} -name "*.h" -and -not -name "linklocator.h" | \
${XARGS} ${REINPLACE_CMD} -e 's/^};/}/g'
@${REINPLACE_CMD} "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
pre-install:
${MKDIR} ${DESTDIR}${PREFIX}/share/applnk/Utilities
@${MKDIR} ${DESTDIR}${PREFIX}/share/applnk/Utilities
.include <bsd.port.post.mk>
.include <bsd.port.mk>

11
sysutils/barry/files/patch-Makefile.in Normal file
View file

@ -0,0 +1,11 @@
--- src/Makefile.in.orig Sun Apr 24 02:27:28 2005
+++ src/Makefile.in Sun Apr 24 02:27:43 2005
@@ -240,7 +240,7 @@
INCLUDES = $(all_includes)
barry_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-barry_LDADD = $(LIB_KIO) $(LIB_KHTML)
+barry_LDADD = $(LIB_KIO) $(LIB_KHTML) $(LIBPTHREAD)
barry_SOURCES = actionprogressdialog.cc application.cc configdialog.cc \
databaseinfodialog.cc databasewrapper.cc dependlistview.cc \

92
sysutils/barry/files/patch-history.h Normal file
View file

@ -0,0 +1,92 @@
--- src/history.h.bak Sun Jun 8 22:09:10 2003
+++ src/history.h Sun Apr 24 02:18:42 2005
@@ -22,44 +22,7 @@
namespace Barry
{
- class History;
-
- class Command
- {
- public:
- enum CreationFlags {
- None = 0x0, Run = 0x1, Register = 0x2
- };
- virtual ~Command();
-
- template <class T>
- static T *create( CreationFlags flags = None )
- {
- T *cmd = new T;
- if ( flags & Register )
- History::self().registerCommand( cmd );
- if ( flags & Run )
- cmd->exec();
- return cmd;
- }
-
- void unexec();
- void exec();
- virtual QString text() const = 0;
-
- protected:
- Command();
- bool executed() const { return m_executed; }
-
- private:
- Command( const Command &rhs );
- Command &operator=( const Command &rhs );
-
- virtual void doExec() = 0;
- virtual void doUnexec() = 0;
-
- bool m_executed;
- };
+ class Command;
class History : public QObject
{
@@ -100,6 +63,43 @@
unsigned int m_maxEntries;
KToolBarPopupAction *m_backAction;
KToolBarPopupAction *m_forwardAction;
+ };
+
+ class Command
+ {
+ public:
+ enum CreationFlags {
+ None = 0x0, Run = 0x1, Register = 0x2
+ };
+ virtual ~Command();
+
+ template <class T>
+ static T *create( CreationFlags flags = None )
+ {
+ T *cmd = new T;
+ if ( flags & Register )
+ History::self().registerCommand( cmd );
+ if ( flags & Run )
+ cmd->exec();
+ return cmd;
+ }
+
+ void unexec();
+ void exec();
+ virtual QString text() const = 0;
+
+ protected:
+ Command();
+ bool executed() const { return m_executed; }
+
+ private:
+ Command( const Command &rhs );
+ Command &operator=( const Command &rhs );
+
+ virtual void doExec() = 0;
+ virtual void doUnexec() = 0;
+
+ bool m_executed;
};
};

11
sysutils/barry/files/patch-orphanedfilesdialog.cc Normal file
View file

@ -0,0 +1,11 @@
--- src/orphanedfilesdialog.cc.orig Sun Apr 24 02:21:02 2005
+++ src/orphanedfilesdialog.cc Sun Apr 24 02:21:10 2005
@@ -52,7 +52,7 @@
++i;
return i;
}
-};
+}
using namespace Barry;

11
sysutils/barry/files/patch-port.cc Normal file
View file

@ -0,0 +1,11 @@
--- src/port.cc.orig Sun Apr 24 02:21:49 2005
+++ src/port.cc Sun Apr 24 02:21:55 2005
@@ -64,7 +64,7 @@
QString m_link;
long long m_size;
};
-};
+}
// This would be nice in Qt
template <class Container>

11
sysutils/barry/files/patch-portlistview.cc Normal file
View file

@ -0,0 +1,11 @@
--- src/portlistview.cc.orig Sun Apr 24 02:22:33 2005
+++ src/portlistview.cc Sun Apr 24 02:22:41 2005
@@ -42,7 +42,7 @@
QListViewItem *m_oldItem;
QListViewItem *m_newItem;
};
-};
+}
using namespace Barry;