cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build after recent gtkmm update.

Browse Source 
While here, link with -pthread, not -lpthread.

This port could probably use an update...
This commit is contained in:
ajacoutot 2010-04-27 20:20:55 +00:00
parent c24b87a433
commit c7848dc5ed
4 changed files with 105 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
productivity/workrave/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.12 2009/10/16 00:58:43 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.13 2010/04/27 20:20:55 ajacoutot Exp $
COMMENT= reminder program for prevention of RSI
DISTNAME= workrave-1.8.5
PKGNAME= ${DISTNAME}p8
PKGNAME= ${DISTNAME}p9
CATEGORIES= productivity x11
HOMEPAGE= http://www.workrave.org/welcome/
@ -27,7 +27,8 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
gtkmm-2.4 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
pangomm-1.4 pcre pixman-1 png popt pthread sigc-2.0 ssl \
stdc++ util xml2 z avahi-client avahi-common avahi-glib \
pthread-stubs xcb
pthread-stubs xcb eggdbus-1 gcrypt gpg-error xcb-render \
xcb-render-util
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=workrave/}

79
productivity/workrave/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.2 2007/11/12 22:05:41 jasper Exp $
$OpenBSD: patch-configure,v 1.3 2010/04/27 20:20:55 ajacoutot Exp $
--- configure.orig Fri Sep 14 22:25:06 2007
+++ configure Thu Nov 8 20:48:27 2007
+++ configure Tue Apr 27 20:22:39 2010
@@ -2953,9 +2953,9 @@ if test "x$config_debug" = "xyes"; then
CXXFLAGS="${CXXFLAGS} -g -Wall -DGLIBCXX_FORCE_NEW -DGLIBCPP_FORCE_NEW"
LDFLAGS="${LDFLAGS} -g"
@ -14,3 +14,78 @@ $OpenBSD: patch-configure,v 1.2 2007/11/12 22:05:41 jasper Exp $
fi
{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
@@ -31596,13 +31596,13 @@ fi
fi
if test -z "$LIBPTHREAD"; then
- { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -31658,7 +31658,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
if test $ac_cv_lib_pthread_pthread_create = yes; then
- LIBPTHREAD="-lpthread"
+ LIBPTHREAD="-pthread"
fi
fi
@@ -41289,13 +41289,13 @@ fi
rm -f conftest*
if test "x$PTHREAD_LIBS" = xerror; then
- { echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthread" >&5
-echo $ECHO_N "checking for pthread_attr_init in -lpthread... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for pthread_attr_init in -pthread" >&5
+echo $ECHO_N "checking for pthread_attr_init in -pthread... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -41351,18 +41351,18 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_attr_init" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_attr_init" >&6; }
if test $ac_cv_lib_pthread_pthread_attr_init = yes; then
- PTHREAD_LIBS="-lpthread"
+ PTHREAD_LIBS="-pthread"
fi
fi
if test "x$PTHREAD_LIBS" = xerror; then
- { echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthreads" >&5
-echo $ECHO_N "checking for pthread_attr_init in -lpthreads... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for pthread_attr_init in -pthreads" >&5
+echo $ECHO_N "checking for pthread_attr_init in -pthreads... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthreads_pthread_attr_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthreads $LIBS"
+LIBS="-pthreads $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -41418,7 +41418,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_pthread_attr_init" >&5
echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_attr_init" >&6; }
if test $ac_cv_lib_pthreads_pthread_attr_init = yes; then
- PTHREAD_LIBS="-lpthreads"
+ PTHREAD_LIBS="-pthreads"
fi
fi

12
productivity/workrave/patches/patch-frontend_plugin_exercises_gtkmm_src_ExercisesPanel_cc Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-frontend_plugin_exercises_gtkmm_src_ExercisesPanel_cc,v 1.1 2010/04/27 20:20:55 ajacoutot Exp $
--- frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc.orig Fri Sep 14 20:50:32 2007
+++ frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc Tue Apr 27 22:13:03 2010
@@ -206,7 +206,7 @@ text_buffer_set_markup (GtkTextBuffer *buffer,
int ExercisesPanel::exercises_pointer = 0;
-ExercisesPanel::ExercisesPanel(Gtk::HButtonBox *dialog_action_area)
+ExercisesPanel::ExercisesPanel(Gtk::ButtonBox *dialog_action_area)
: Gtk::HBox(false, 6),
exercises(Exercise::get_exercises())
{

12
productivity/workrave/patches/patch-frontend_plugin_exercises_gtkmm_src_ExercisesPanel_hh Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-frontend_plugin_exercises_gtkmm_src_ExercisesPanel_hh,v 1.1 2010/04/27 20:20:55 ajacoutot Exp $
--- frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh.orig Fri Sep 14 20:50:32 2007
+++ frontend/plugin/exercises/gtkmm/src/ExercisesPanel.hh Tue Apr 27 22:13:00 2010
@@ -42,7 +42,7 @@
class ExercisesPanel : public Gtk::HBox
{
public:
- ExercisesPanel(Gtk::HButtonBox *dialog_action_area);
+ ExercisesPanel(Gtk::ButtonBox *dialog_action_area);
~ExercisesPanel();
void set_exercise_count(int num);