[cvs] dists/10.7/stable/main/finkinfo/gnome gtkwave.info,1.3,1.4

2011-12-31 Thread Charles Lepple
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome
In directory vz-cvs-3.sog:/tmp/cvs-serv14006

Modified Files:
gtkwave.info 
Log Message:
new upstream gtkwave (3.3.29)

Added some desktop/MIME integration stuff that I don't know how to fully test.
Email if it causes problems.


Index: gtkwave.info
===
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome/gtkwave.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gtkwave.info21 Nov 2011 01:29:27 -  1.3
+++ gtkwave.info31 Dec 2011 18:59:58 -  1.4
@@ -1,9 +1,9 @@
 Package: gtkwave
-Version: 3.3.28
+Version: 3.3.29
 Revision: 1
 
 Source: http://gtkwave.sourceforge.net/%n-%v.tar.gz
-Source-MD5: 396cc15cfc12801c9ad6af507ee4a0f1
+Source-MD5: ca55432a249c7420520ddd330c14e8e0
 
 BuildDepends: 
   atk1 (= 1.20.0-1),
@@ -39,7 +39,7 @@
   x11-shlibs
 
 
-ConfigureParams: --with-tcl=%p/lib --with-tk=%p/lib --mandir=%p/share/man 
--infodir=%p/share/info --disable-dependency-tracking 
PKG_CONFIG_PATH=%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+ConfigureParams: --with-tcl=%p/lib --with-tk=%p/lib --mandir=%p/share/man 
--infodir=%p/share/info --disable-dependency-tracking 
PKG_CONFIG_PATH=%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config 
ac_cv_path_UPDATE_DESKTOP_DATABASE=/usr/bin/true 
ac_cv_path_UPDATE_MIME_DATABASE=/usr/bin/true
 
 InstallScript: 
   make install DESTDIR=%d
@@ -48,6 +48,17 @@
   rmdir %i/share/gtkwave
 
 
+PostInstScript: 
+. %p/bin/init.sh
+%p/bin/update-mime-database %p/share/mime /dev/null
+   [ -x %p/bin/update-desktop-database ]  update-desktop-database -q || :
+
+PostRmScript: 
+. %p/bin/init.sh
+%p/bin/update-mime-database %p/share/mime /dev/null
+   [ -x %p/bin/update-desktop-database ]  update-desktop-database -q || :
+
+
 DocFiles: ANALOG_README.TXT CHANGELOG.TXT GNU.TXT INSTALL.TXT LICENSE.TXT 
MIT.TXT SYSTEMVERILOG_README.TXT
 
 DescDetail: 


--
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual 
desktops for less than the cost of PCs and save 60% on VDI infrastructure 
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/dazjorz/finkinfo apt.info,1.11,1.12

2011-12-31 Thread Sjors Gielen
Update of /cvsroot/fink/experimental/dazjorz/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv6051

Modified Files:
apt.info 
Log Message:
Remove doc-files generation, because it refers to external file. Also described 
this in the DescPackaging.


Index: apt.info
===
RCS file: /cvsroot/fink/experimental/dazjorz/finkinfo/apt.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- apt.info29 Dec 2011 22:35:52 -  1.11
+++ apt.info31 Dec 2011 20:51:56 -  1.12
@@ -2,7 +2,7 @@
 Version: 0.7.25.3
 Revision: 15
 GCC: 4.0
-BuildDepends: fink (= 0.24.12), libtool2, docbook-xsl
+BuildDepends: fink (= 0.24.12), libtool2
 Depends: %N-inst4-shlibs (= %v-%r), %N-pkg1-shlibs (= %v-%r), dpkg (= 
1.15.5.6-9)
 Source: 
http://snapshot.debian.org/archive/debian/20100202T220747Z/pool/main/a/apt/apt_%v.tar.gz
 Source-MD5: ee59a90b91764aefeb5eb0f29d5cab96
@@ -12,7 +12,9 @@
 PatchScript: 
  sed -e 's|@PREFIX@|%p|g' -e s|@PERLARCH32@|$VERSIONER_PERL_PREFER_32_BIT|  
%{PatchFile} | patch -p1
  sh patch_flush
- perl -pi -e 's|/usr|%p|g' doc/*.8.xml
+ #perl -pi -e 's|/usr|%p|g' doc/*.8.xml
+ rm doc/makefile
+ echo 'all:' doc/makefile
  for i in `grep -rl '#ifdef __GNUG__' .` ; do perl -pi -e 's/#ifdef 
__GNUG__/#if defined(__GNUG__)  !defined(__APPLE_CC__)/' $i; done
 
 NoSetCPPFLAGS: true
@@ -26,7 +28,7 @@
  ln -s %p/share/libtool/config/config.guess buildlib/config.guess
  aclocal -I buildlib
  autoconf
- mkdir -p build/doc/doxygen
+ mkdir build
  ln -s ../buildlib build/buildlib
  (cd build  ../configure %c)
  (cd build  make NOISY=1)
@@ -62,13 +64,13 @@
  cp build/include/apt-pkg/*.h %i/include/apt-pkg/
 
  # docs
- mkdir -p %i/share/man
- mkdir -p %i/share/man/man1
- mkdir -p %i/share/man/man5
- mkdir -p %i/share/man/man8
- install -m 644 doc/*.1 %i/share/man/man1/
- install -m 644 doc/*.5 %i/share/man/man5/
- install -m 644 doc/*.8 %i/share/man/man8/
+ #mkdir -p %i/share/man
+ #mkdir -p %i/share/man/man1
+ #mkdir -p %i/share/man/man5
+ #mkdir -p %i/share/man/man8
+ #install -m 644 doc/*.1 %i/share/man/man1/
+ #install -m 644 doc/*.5 %i/share/man/man5/
+ #install -m 644 doc/*.8 %i/share/man/man8/
 
  # configuration and stub directories
  mkdir -p %i/etc/apt/apt.conf.d
@@ -205,8 +207,9 @@
   not in 10.5. Therefore, IssuerCert and CrlFile support are only compiled in 
on
   platforms where the CURLOPTs are defined. Also, add a WARNING to the docs.
 
-  Sjors - Fix docs, since docbook.xsl is in another location on Mac. Also 
depend
-  on docbook-xsl to create the documentation.
+  Sjors - Don't build docs; the docs shipped with apt refer to external
+  locations that are fetched over HTTP, and we don't want this. This means
+  there are no manpages unless we pre-convert them ourselves.
 
   Sjors - The standard build process creates a 'makefile' next to 'Makefile',
   but on case insensitive Macs the normal Makefile is overwritten, causing an


--
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual 
desktops for less than the cost of PCs and save 60% on VDI infrastructure 
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/stable/main/finkinfo/graphics inkscape.info, 1.8, 1.9 inkscape.patch, 1.3, 1.4

2011-12-31 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv13624/stable/main/finkinfo/graphics

Modified Files:
inkscape.info inkscape.patch 
Log Message:
new version, taking over with consent of former maintainer


Index: inkscape.patch
===
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/inkscape.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- inkscape.patch  10 Nov 2011 20:58:52 -  1.3
+++ inkscape.patch  31 Dec 2011 21:21:51 -  1.4
@@ -1,69 +1,111 @@
-diff -Nurd -x'*~' inkscape-0.46.orig/configure inkscape-0.46/configure
 inkscape-0.46.orig/configure   2008-03-11 00:47:08.0 -0400
-+++ inkscape-0.46/configure2008-10-29 01:36:01.0 -0400
-@@ -10638,6 +10638,9 @@
+diff -Nurd -x'*~' inkscape-0.48.2.orig/configure inkscape-0.48.2/configure
+--- inkscape-0.48.2.orig/configure 2011-07-08 15:25:02.0 -0400
 inkscape-0.48.2/configure  2011-12-09 15:32:23.0 -0500
+@@ -10840,6 +10840,8 @@
  $as_echo yes 6; }
-   :
+ 
  fi
 +INKSCAPE_CFLAGS=$INKSCAPE_CFLAGS -I/usr/X11R6/include
 +INKSCAPE_LIBS=$INKSCAPE_LIBS -L/usr/X11R6/lib -lX11
-+
  
  # Check for Apple Mac OS X Carbon framework
  carbon_ok=no
-diff -Nurd inkscape-0.46.orig/src/dom/uri.h inkscape-0.46/src/dom/uri.h
 inkscape-0.46.orig/src/dom/uri.h   2008-03-11 00:19:31.0 -0400
-+++ inkscape-0.46/src/dom/uri.h2008-04-25 02:39:17.0 -0400
-@@ -32,6 +32,7 @@
- 
- #include dom.h
- 
-+#include glib.h
- 
- namespace org
- {
-diff -Nurd inkscape-0.46.orig/src/dom/util/ziptool.h 
inkscape-0.46/src/dom/util/ziptool.h
 inkscape-0.46.orig/src/dom/util/ziptool.h  2008-03-11 00:19:32.0 
-0400
-+++ inkscape-0.46/src/dom/util/ziptool.h   2008-04-25 02:39:17.0 
-0400
-@@ -32,6 +32,7 @@
-  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  */
+diff -Nurd -x'*~' inkscape-0.48.2.orig/src/Makefile.in 
inkscape-0.48.2/src/Makefile.in
+--- inkscape-0.48.2.orig/src/Makefile.in   2011-07-08 15:25:02.0 
-0400
 inkscape-0.48.2/src/Makefile.in2011-12-13 16:55:27.0 -0500
+@@ -2438,6 +2438,9 @@
+ # Add Inkview-only sources here.
+ inkview_SOURCES = inkview.cpp $(win32_sources)
+ INCLUDES = \
++  -I$(top_srcdir)/cxxtest \
++  -I$(srcdir)/bind/javainc \
++  -I$(srcdir)/bind/javainc/linux \
+   $(PERL_CFLAGS) $(PYTHON_CFLAGS) \
+   $(FREETYPE_CFLAGS)  \
+   $(GNOME_PRINT_CFLAGS)   \
+@@ -2451,10 +2454,7 @@
+   $(POPPLER_GLIB_CFLAGS)  \
+   -DPOTRACE=\potrace\   \
+   $(INKSCAPE_CFLAGS) \
+-  -I$(top_srcdir)/cxxtest \
+   $(WIN32_CFLAGS) \
+-  -I$(srcdir)/bind/javainc \
+-  -I$(srcdir)/bind/javainc/linux \
+   $(AM_CPPFLAGS)
  
-+#include glib.h
+ CXXTEST_TEMPLATE = $(srcdir)/cxxtest-template.tpl
+diff -Nurd -x'*~' inkscape-0.48.2.orig/src/box3d.cpp 
inkscape-0.48.2/src/box3d.cpp
+--- inkscape-0.48.2.orig/src/box3d.cpp 2011-07-08 14:25:09.0 -0400
 inkscape-0.48.2/src/box3d.cpp  2011-12-09 15:42:12.0 -0500
+@@ -431,6 +431,9 @@
+ static double remember_snap_threshold = 30;
+ static guint remember_snap_index = 0;
  
- #include vector
- #include string
-diff -Nurd inkscape-0.46.orig/src/dom/xmlreader.h 
inkscape-0.46/src/dom/xmlreader.h
 inkscape-0.46.orig/src/dom/xmlreader.h 2008-03-11 00:19:32.0 
-0400
-+++ inkscape-0.46/src/dom/xmlreader.h  2008-04-25 02:39:17.0 -0400
-@@ -39,6 +39,7 @@
- namespace dom
- {
++// constant for sizing the array of points to be considered:
++static const int MAX_POINT_COUNT = 4;
++
+ static Proj::Pt3
+ box3d_snap (SPBox3D *box, int id, Proj::Pt3 const pt_proj, Proj::Pt3 const 
start_pt) {
+ double z_coord = start_pt[Proj::Z];
+@@ -460,7 +463,7 @@
+ Box3D::Line diag2(A, E); // diag2 is only taken into account if id equals 
-1, i.e., if we are snapping the center
  
-+#include glib.h
+ int num_snap_lines = (id != -1) ? 3 : 4;
+-Geom::Point snap_pts[num_snap_lines];
++Geom::Point snap_pts[MAX_POINT_COUNT];
  
+ snap_pts[0] = pl1.closest_to (pt);
+ snap_pts[1] = pl2.closest_to (pt);
+@@ -472,7 +475,7 @@
+ gdouble const zoom = inkscape_active_desktop()-current_zoom();
  
- class XmlReader
-diff -Nurd inkscape-0.46.orig/src/dom/xpathparser.h 
inkscape-0.46/src/dom/xpathparser.h
 inkscape-0.46.orig/src/dom/xpathparser.h   2008-03-11 00:19:31.0 
-0400
-+++ inkscape-0.46/src/dom/xpathparser.h2008-04-25 02:39:17.0 
-0400
-@@ -34,6 +34,8 @@
- #include stdio.h
- #include stdarg.h
+ // determine the distances to all potential snapping points
+-double snap_dists[num_snap_lines];
++double snap_dists[MAX_POINT_COUNT];
+ for (int i = 0; i  num_snap_lines; ++i) {
+ snap_dists[i] = Geom::L2 (snap_pts[i] - pt) * zoom;
+ }
+diff -Nurd -x'*~' 

[cvs] dists/10.7/stable/main/finkinfo/graphics inkscape.info, NONE, 1.1 inkscape.patch, NONE, 1.1

2011-12-31 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv13673/10.7/main/finkinfo/graphics

Added Files:
inkscape.info inkscape.patch 
Log Message:
add inkscape to 10.7--builds and works for me, also confirmed by former 
maintainer
 CVS: --


--- NEW FILE: inkscape.patch ---
diff -Nurd -x'*~' inkscape-0.48.2.orig/configure inkscape-0.48.2/configure
--- inkscape-0.48.2.orig/configure  2011-07-08 15:25:02.0 -0400
+++ inkscape-0.48.2/configure   2011-12-09 15:32:23.0 -0500
@@ -10840,6 +10840,8 @@
 $as_echo yes 6; }
 
 fi
+INKSCAPE_CFLAGS=$INKSCAPE_CFLAGS -I/usr/X11R6/include
+INKSCAPE_LIBS=$INKSCAPE_LIBS -L/usr/X11R6/lib -lX11
 
 # Check for Apple Mac OS X Carbon framework
 carbon_ok=no
diff -Nurd -x'*~' inkscape-0.48.2.orig/src/Makefile.in 
inkscape-0.48.2/src/Makefile.in
--- inkscape-0.48.2.orig/src/Makefile.in2011-07-08 15:25:02.0 
-0400
+++ inkscape-0.48.2/src/Makefile.in 2011-12-13 16:55:27.0 -0500
@@ -2438,6 +2438,9 @@
 # Add Inkview-only sources here.
 inkview_SOURCES = inkview.cpp $(win32_sources)
 INCLUDES = \
+   -I$(top_srcdir)/cxxtest \
+   -I$(srcdir)/bind/javainc \
+   -I$(srcdir)/bind/javainc/linux \
$(PERL_CFLAGS) $(PYTHON_CFLAGS) \
$(FREETYPE_CFLAGS)  \
$(GNOME_PRINT_CFLAGS)   \
@@ -2451,10 +2454,7 @@
$(POPPLER_GLIB_CFLAGS)  \
-DPOTRACE=\potrace\   \
$(INKSCAPE_CFLAGS) \
-   -I$(top_srcdir)/cxxtest \
$(WIN32_CFLAGS) \
-   -I$(srcdir)/bind/javainc \
-   -I$(srcdir)/bind/javainc/linux \
$(AM_CPPFLAGS)
 
 CXXTEST_TEMPLATE = $(srcdir)/cxxtest-template.tpl
diff -Nurd -x'*~' inkscape-0.48.2.orig/src/box3d.cpp 
inkscape-0.48.2/src/box3d.cpp
--- inkscape-0.48.2.orig/src/box3d.cpp  2011-07-08 14:25:09.0 -0400
+++ inkscape-0.48.2/src/box3d.cpp   2011-12-09 15:42:12.0 -0500
@@ -431,6 +431,9 @@
 static double remember_snap_threshold = 30;
 static guint remember_snap_index = 0;
 
+// constant for sizing the array of points to be considered:
+static const int MAX_POINT_COUNT = 4;
+
 static Proj::Pt3
 box3d_snap (SPBox3D *box, int id, Proj::Pt3 const pt_proj, Proj::Pt3 const 
start_pt) {
 double z_coord = start_pt[Proj::Z];
@@ -460,7 +463,7 @@
 Box3D::Line diag2(A, E); // diag2 is only taken into account if id equals 
-1, i.e., if we are snapping the center
 
 int num_snap_lines = (id != -1) ? 3 : 4;
-Geom::Point snap_pts[num_snap_lines];
+Geom::Point snap_pts[MAX_POINT_COUNT];
 
 snap_pts[0] = pl1.closest_to (pt);
 snap_pts[1] = pl2.closest_to (pt);
@@ -472,7 +475,7 @@
 gdouble const zoom = inkscape_active_desktop()-current_zoom();
 
 // determine the distances to all potential snapping points
-double snap_dists[num_snap_lines];
+double snap_dists[MAX_POINT_COUNT];
 for (int i = 0; i  num_snap_lines; ++i) {
 snap_dists[i] = Geom::L2 (snap_pts[i] - pt) * zoom;
 }
diff -Nurd -x'*~' inkscape-0.48.2.orig/src/graphlayout.cpp 
inkscape-0.48.2/src/graphlayout.cpp
--- inkscape-0.48.2.orig/src/graphlayout.cpp2011-07-08 14:25:09.0 
-0400
+++ inkscape-0.48.2/src/graphlayout.cpp 2011-12-09 15:59:40.0 -0500
@@ -155,11 +155,12 @@
  ++i)
 {
 SPItem *iu=*i;
-mapstring,unsigned::iterator i=nodelookup.find(iu-getId());
-if(i==nodelookup.end()) {
+mapstring,unsigned::iterator i_iter=nodelookup.find(iu-getId());
+mapstring,unsigned::iterator i_iter_end=nodelookup.end();
+if(i_iter==i_iter_end) {
 continue;
 }
-unsigned u=i-second;
+unsigned u=i_iter-second;
 GSList *nlist=iu-avoidRef-getAttachedConnectors(Avoid::runningFrom);
 listSPItem * connectors;
 
diff -Nurd -x'*~' inkscape-0.48.2.orig/src/ui/widget/registered-widget.h 
inkscape-0.48.2/src/ui/widget/registered-widget.h
--- inkscape-0.48.2.orig/src/ui/widget/registered-widget.h  2011-07-08 
14:25:09.0 -0400
+++ inkscape-0.48.2/src/ui/widget/registered-widget.h   2011-12-09 
15:47:53.0 -0500
@@ -61,9 +61,6 @@
 
 bool is_updating() {if (_wr) return _wr-isUpdating(); else return false;}
 
-// provide automatic 'upcast' for ease of use. (do it 'dynamic_cast' 
instead of 'static' because who knows what W is)
-operator const Gtk::Widget () { return dynamic_castGtk::Widget*(this); }
-
 protected:
 RegisteredWidget() : W() { construct(); }
 template typename A 
diff -Nurd -x'*~' inkscape-0.48.2.orig/src/widgets/desktop-widget.h 
inkscape-0.48.2/src/widgets/desktop-widget.h
--- inkscape-0.48.2.orig/src/widgets/desktop-widget.h   2011-07-08 
14:25:09.0 -0400
+++ inkscape-0.48.2/src/widgets/desktop-widget.h2011-12-09 
15:52:21.0 -0500
@@ -239,7 +239,7 @@
 private:
 GtkWidget *tool_toolbox;
 GtkWidget *aux_toolbox;
-GtkWidget 

[cvs] experimental/dmacks/finkinfo inkscape.info, 1.8, NONE inkscape.patch, 1.4, NONE

2011-12-31 Thread Daniel Macks
Update of /cvsroot/fink/experimental/dmacks/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv13756

Removed Files:
inkscape.info inkscape.patch 
Log Message:
-10.[67]


--- inkscape.patch DELETED ---

--- inkscape.info DELETED ---


--
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual 
desktops for less than the cost of PCs and save 60% on VDI infrastructure 
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/stable/main/finkinfo/utils tmpreaper.info,1.1,1.2

2011-12-31 Thread Hans-Christoph Steiner
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils
In directory vz-cvs-3.sog:/tmp/cvs-serv21811

Modified Files:
tmpreaper.info 
Log Message:
upstream update to v1.6.13+nmu1

Index: tmpreaper.info
===
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils/tmpreaper.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tmpreaper.info  14 Jun 2011 19:38:44 -  1.1
+++ tmpreaper.info  1 Jan 2012 00:50:15 -   1.2
@@ -1,9 +1,9 @@
 Package: tmpreaper
-Version: 1.6.11
+Version: 1.6.13+nmu1
 Revision: 1
 ###
 Source: mirror:debian:pool/main/t/%N/%N_%v.tar.gz
-Source-MD5: f9ecad777a8896798a684f53581bde7d
+Source-MD5: 36bffb38fbdd28b9de8af229faabf5fe
 SourceDirectory: %N-%v
 ###
 DocFiles: README COPYING ChangeLog


--
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual 
desktops for less than the cost of PCs and save 60% on VDI infrastructure 
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs