mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

- Update to 2.4.1

Browse Source 
PR:		ports/81864
Submitted by:	Ports Fury
This commit is contained in:
Sergey Matveychuk 2005-06-05 13:34:20 +00:00
parent 835efa59da
commit dd8a978938
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=136821
8 changed files with 43 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
x11-toolkits/vdk/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= vdk
PORTVERSION= 2.4.0
PORTREVISION= 2
PORTVERSION= 2.4.1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= vdklib
@ -16,19 +15,24 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= C++ wrapper for GTK+ toolkit
USE_X_PREFIX= yes
USE_GNOME= gnometarget gtk20 lthack
USE_GNOME= gnomehack gnometarget gtk20
USE_REINPLACE= yes
USE_LIBTOOL_VER=15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib -lgnuregex ${PTHREAD_LIBS}"
USE_LIBTOOL_VER= 15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-opt=no --enable-doc-html=no --enable-testvdk=no
INSTALLS_SHLIB= yes
MAN1= vdk-config-2.1
CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS= -L${LOCALBASE}/lib -lgnuregex ${PTHREAD_LIBS}
post-patch:
@${REINPLACE_CMD} -e 's|CXXFLAGS="-s"|CXXFLAGS="$$CXXFLAGS"|g ; \
s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e \
's|CXXFLAGS="-s"|CXXFLAGS="$$CXXFLAGS"|g' ${WRKSRC}/configure
.for file in vdk-config-2.in vdk-2.x.pc.in
@${REINPLACE_CMD} -e 's|-lpthread|${LDFLAGS}|g' ${WRKSRC}/${file}
.endfor
.for file in vdk/FileDialog.h vdk/gtksourcebuffer.h vdk/gtksourcetag.h
@${REINPLACE_CMD} -e 's|<regex\.h>|<gnuregex.h>|g' ${WRKSRC}/${file}
.endfor

4
x11-toolkits/vdk/distinfo
View File

@ -1,2 +1,2 @@
MD5 (vdk-2.4.0.tar.gz) = b23dcfa237dbf4b9424bcaa37683a7ba
SIZE (vdk-2.4.0.tar.gz) = 1071732
MD5 (vdk-2.4.1.tar.gz) = f388bf265a476880e98ddec7ac4e63f7
SIZE (vdk-2.4.1.tar.gz) = 1062475

14
x11-toolkits/vdk/files/patch-vdk-config-2.in
View File

@ -1,14 +0,0 @@
--- vdk-config-2.in.orig Wed Nov 22 14:06:52 2000
+++ vdk-config-2.in Tue Nov 18 12:03:59 2003
@@ -16,9 +16,9 @@
LIBDIRS="-L@libdir@"
vdk_libs="$LIBDIRS -lvdk @GNOME_VDK@ @GTK_LIBS@\
- @SIGC_LIBS@ @GNOME_LIBS@"
+ @SIGC_LIBS@ @GNOME_LIBS@ @LDFLAGS@"
vdk_cflags="$CFLAGS @GTK_CFLAGS@ @SIGC_CFLAGS@\
- @GNOME_CFLAGS@ @SIGCDEFINE@ @GNOMEDEFINE@"
+ @GNOME_CFLAGS@ @SIGCDEFINE@ @GNOMEDEFINE@ @CPPFLAGS@"
usage()
{

48
x11-toolkits/vdk/files/patch-vdk::Makefile.in
View File

@ -1,27 +1,35 @@
--- vdk/Makefile.in.orig Tue May 18 15:55:11 2004
+++ vdk/Makefile.in Fri Jul 9 02:31:31 2004
@@ -197,7 +197,6 @@
# vdktextview.h
# vdkpacker.h
vdkinclude_HEADERS = \
- regex.h\
gtksourcebuffer.h\
gtktextsearch.h \
gtksourcetag.h\
@@ -333,7 +332,6 @@
# vdkregex.cc
# vdkpacker.cc
libvdk_la_SOURCES = \
- regex.c\
gtksourcebuffer.c\
gtktextsearch.c \
gtksourcetag.c\
@@ -440,7 +438,7 @@
--- vdk/Makefile.in.orig Wed May 25 00:05:27 2005
+++ vdk/Makefile.in Thu Jun 2 13:58:14 2005
@@ -59,7 +59,7 @@
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libvdk_la_LIBADD =
-am_libvdk_la_OBJECTS = regex.lo gtksourcebuffer.lo gtktextsearch.lo \
+am_libvdk_la_OBJECTS = gtksourcebuffer.lo gtktextsearch.lo \
gtksourcetag.lo gtksourceview.lo gtkundomanager.lo \
gtksourceview-marshal.lo gtktextregion.lo vdkeditor.lo \
gtkdatabox.lo gtkdataboxmarshal.lo abstract_button.lo \
@@ -231,7 +231,6 @@
lib_LTLIBRARIES = libvdk.la
vdkincludedir = $(includedir)/vdk2/vdk
vdkinclude_HEADERS = \
- regex.h\
gtksourcebuffer.h\
gtktextsearch.h \
gtksourcetag.h\
@@ -330,7 +329,6 @@
vdkdockable.h
libvdk_la_SOURCES = \
- regex.c\
gtksourcebuffer.c\
gtktextsearch.c \
gtksourcetag.c\
@@ -528,7 +526,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawobj.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawpixbuf.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawpixmap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrolled.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/separator.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slider.Plo@am__quote@

45
x11-toolkits/vdk/files/patch-vdk::chart.cc
View File

@ -1,45 +0,0 @@
--- vdk/chart.cc.orig Wed May 22 17:26:12 2002
+++ vdk/chart.cc Thu Aug 5 19:16:35 2004
@@ -45,7 +45,10 @@
size = Usize;
printf("\nsize:%d,%d",size.x,size.y);
fflush(stdout);
- axis = ChartAxis(this,size.X(),size.Y());
+ // patch Bug#262091
+ // axis = ChartAxis(this,size.X(),size.Y());
+ ChartAxis axis_tmp( this, size.X(), size.Y() );
+ axis = axis_tmp;
axis.Draw();
DrawTitle();
DrawChart();
@@ -115,7 +118,10 @@
void VDKChart::SetChartBorder(int b)
{
size = Usize;
-axis = ChartAxis(this,size.X(),size.Y());
+// patch Bug#262091
+// axis = ChartAxis(this,size.X(),size.Y());
+ChartAxis axis_tmp(this,size.X(),size.Y());
+axis = axis_tmp;
DrawChart();
}
/*
@@ -415,10 +421,18 @@
ChartAxis::ChartAxis(VDKChart* owner,int w, int h):
owner(owner)
{
+// patch Bug#262091
+/*
domain = VDKRect(owner->ChartBorder,
h-owner->ChartBorder,
w-owner->ChartBorder*2,
h-owner->ChartBorder*2);
+*/
+VDKRect r(owner->ChartBorder,
+ h-owner->ChartBorder,
+ w-owner->ChartBorder*2,
+ h-owner->ChartBorder*2);
+domain = r;
}
/*
copy-initializer

62
x11-toolkits/vdk/files/patch-vdk::vdkbtrees.h
View File

@ -1,62 +0,0 @@
--- vdk/vdkbtrees.h.orig Wed Nov 22 14:10:33 2000
+++ vdk/vdkbtrees.h Thu Aug 5 19:16:36 2004
@@ -717,7 +717,7 @@
class AbstractRedBlackTree : public AbstractBinaryTree<T, Node> {
protected:
virtual Node *FindNode(T q)
- { return (root) ? (Node *) root->find(q) : NULL; }
+ { return (this->root) ? (Node *) this->root->find(q) : NULL; }
};
/*!
@@ -985,14 +985,14 @@
BlackHeight = -1;
// Check binary tree properties.
- if (parent != _parent)
+ if (this->parent != _parent)
return NULL;
- if (left) {
- if (object < left->object)
+ if (this->left) {
+ if (this->object < this->left->object)
return NULL;
}
- if (right) {
- if (right->object < object)
+ if (this->right) {
+ if (this->right->object < this->object)
return NULL;
}
@@ -1001,15 +1001,15 @@
// If a node is red, then both its children are black
// (NULL nodes are black).
if (clr == Red) {
- if ((left && left->clr != Black) ||
- (right && right->clr != Black))
+ if ((this->left && this->left->clr != Black) ||
+ (this->right && this->right->clr != Black))
return NULL;
}
// The black-heights of all leaf nodes are equal.
int bh = NULL;
- if ((! left) && (! right)) {
+ if ((! this->left) && (! this->right)) {
// Compute black-height of node
for (Node *sc = (Node *) this; sc; sc = sc->parent)
if (sc->clr == Black)
@@ -1023,9 +1023,9 @@
return NULL;
}
}
- if (left && (! left->CheckTreeProperties((Node *) this)))
+ if (this->left && (! this->left->CheckTreeProperties((Node *) this)))
return NULL;
- if (right && (! right->CheckTreeProperties((Node *) this)))
+ if (this->right && (! this->right->CheckTreeProperties((Node *) this)))
return NULL;
return 1;
}

58
x11-toolkits/vdk/files/patch-vdk::vdkheap.h
View File

@ -1,58 +0,0 @@
--- vdk/vdkheap.h.orig Wed Nov 22 14:10:52 2000
+++ vdk/vdkheap.h Thu Aug 5 19:16:36 2004
@@ -85,7 +85,7 @@
VDKHeap<T>::VDKHeap(T* source, int size): VDKContainer<T>(size)
{
for(int i = 0; i < size; i++)
- data[i] = source[i];
+ this->data[i] = source[i];
BuildHeap();
}
@@ -94,13 +94,13 @@
void VDKHeap<T>::Heapify(int i, int heapsize)
{
int l = left(i), r = right(i), largest = i;
- if( (l < heapsize) && (data[l] > data[i])) largest = l;
- if( (r < heapsize) && (data[r] > data[largest])) largest = r;
+ if( (l < heapsize) && (this->data[l] > this->data[i])) largest = l;
+ if( (r < heapsize) && (this->data[r] > this->data[largest])) largest = r;
if(largest != i)
{
- T temp = data[i];
- data[i] = data[largest];
- data[largest] = temp;
+ T temp = this->data[i];
+ this->data[i] = this->data[largest];
+ this->data[largest] = temp;
Heapify(largest,heapsize);
}
}
@@ -109,21 +109,21 @@
template <class T>
void VDKHeap<T>::BuildHeap(void)
{
- for (int i = (size()-1)/2 ; i >= 0; i--)
- Heapify(i,size());
+ for (int i = (this->size()-1)/2 ; i >= 0; i--)
+ Heapify(i,this->size());
}
// HEAPSORT
template <class T>
void VDKHeap<T>::Sort(void)
{
- int heapsize = size();
+ int heapsize = this->size();
int i = heapsize-1;
for(; i > 0; i--)
{
- T temp = data[0];
- data[0] = data[i];
- data[i] = temp;
+ T temp = this->data[0];
+ this->data[0] = this->data[i];
+ this->data[i] = temp;
heapsize--;
Heapify(0,heapsize);
}

6
x11-toolkits/vdk/pkg-plist
View File

@ -82,11 +82,6 @@ include/vdk2/vdk/vdkfeatures.h
include/vdk2/vdk/vdkfilechooser.h
include/vdk2/vdk/vdkfileicondlg.h
include/vdk2/vdk/vdkfont.h
include/vdk2/vdk/vdkgnomeapp.h
include/vdk2/vdk/vdkgnomeappbar.h
include/vdk2/vdk/vdkgnomededit.h
include/vdk2/vdk/vdkgnomeentry.h
include/vdk2/vdk/vdkgnomeform.h
include/vdk2/vdk/vdkheap.h
include/vdk2/vdk/vdkhlbutton.h
include/vdk2/vdk/vdkhlbuttonbar.h
@ -103,6 +98,7 @@ include/vdk2/vdk/widcontain.h
lib/libvdk.a
lib/libvdk.so
lib/libvdk.so.6
libdata/pkgconfig/vdk-2.x.pc
share/aclocal/vdk-2.m4
@dirrm include/vdk2/vdk
@dirrm include/vdk2