Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/text
In directory vz-cvs-3.sog:/tmp/cvs-serv17967
Modified Files:
miktex-tools.info miktex-tools.patch
Log Message:
Fix use of libcurl return parameters, this fixes a connection bug on 10.7. Also
bump libpng depends to the right version.
Index: miktex-tools.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/text/miktex-tools.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- miktex-tools.patch 7 Jan 2012 21:26:20 -0000 1.1
+++ miktex-tools.patch 8 Jan 2012 18:36:43 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Nurd miktex-2.8.3541/BuildUtilities/c4p/gram.y
miktex-new-2.8.3541/BuildUtilities/c4p/gram.y
+diff -Nurd miktex-2.8.3541/BuildUtilities/c4p/gram.y
miktex-2.8.3541-patched/BuildUtilities/c4p/gram.y
--- miktex-2.8.3541/BuildUtilities/c4p/gram.y 2009-01-20 17:41:55.000000000
+0100
-+++ miktex-new-2.8.3541/BuildUtilities/c4p/gram.y 2011-03-23
12:55:57.000000000 +0100
++++ miktex-2.8.3541-patched/BuildUtilities/c4p/gram.y 2012-01-08
19:28:26.000000000 +0100
@@ -23,7 +23,6 @@
#include <cstring>
#include <cstdlib>
@@ -9,9 +9,9 @@
#include "common.h"
-diff -Nurd miktex-2.8.3541/CMakeLists.txt miktex-new-2.8.3541/CMakeLists.txt
+diff -Nurd miktex-2.8.3541/CMakeLists.txt
miktex-2.8.3541-patched/CMakeLists.txt
--- miktex-2.8.3541/CMakeLists.txt 2009-02-24 12:37:30.000000000 +0100
-+++ miktex-new-2.8.3541/CMakeLists.txt 2011-03-23 13:01:15.000000000 +0100
++++ miktex-2.8.3541-patched/CMakeLists.txt 2012-01-08 19:28:26.000000000
+0100
@@ -249,13 +249,14 @@
set(HAVE_MPM_QT_SOURCES 1)
endif(EXISTS ${CMAKE_SOURCE_DIR}/${rel_mpm_qt_dir}/)
@@ -39,9 +39,9 @@
endif(NATIVE_WINDOWS)
###############################################################################
-diff -Nurd miktex-2.8.3541/Libraries/MiKTeX/KPathSeaEmulation/StdAfx.h
miktex-new-2.8.3541/Libraries/MiKTeX/KPathSeaEmulation/StdAfx.h
+diff -Nurd miktex-2.8.3541/Libraries/MiKTeX/KPathSeaEmulation/StdAfx.h
miktex-2.8.3541-patched/Libraries/MiKTeX/KPathSeaEmulation/StdAfx.h
--- miktex-2.8.3541/Libraries/MiKTeX/KPathSeaEmulation/StdAfx.h
2008-12-21 20:30:05.000000000 +0100
-+++ miktex-new-2.8.3541/Libraries/MiKTeX/KPathSeaEmulation/StdAfx.h
2011-03-23 12:55:57.000000000 +0100
++++ miktex-2.8.3541-patched/Libraries/MiKTeX/KPathSeaEmulation/StdAfx.h
2012-01-08 19:28:26.000000000 +0100
@@ -22,7 +22,6 @@
#pragma once
@@ -50,9 +50,9 @@
#if defined(MIKTEX_UNIX)
#include <sys/time.h>
#endif
-diff -Nurd miktex-2.8.3541/Libraries/MiKTeX/KPathSeaEmulation/kpsemu.cpp
miktex-new-2.8.3541/Libraries/MiKTeX/KPathSeaEmulation/kpsemu.cpp
+diff -Nurd miktex-2.8.3541/Libraries/MiKTeX/KPathSeaEmulation/kpsemu.cpp
miktex-2.8.3541-patched/Libraries/MiKTeX/KPathSeaEmulation/kpsemu.cpp
--- miktex-2.8.3541/Libraries/MiKTeX/KPathSeaEmulation/kpsemu.cpp
2009-01-26 16:23:49.000000000 +0100
-+++ miktex-new-2.8.3541/Libraries/MiKTeX/KPathSeaEmulation/kpsemu.cpp
2011-03-23 12:55:57.000000000 +0100
++++ miktex-2.8.3541-patched/Libraries/MiKTeX/KPathSeaEmulation/kpsemu.cpp
2012-01-08 19:28:26.000000000 +0100
@@ -527,6 +527,13 @@
FATAL_CRT_ERROR ("fseeko64", lpszFileName);
}
@@ -82,9 +82,24 @@
#else
# error Unimplemented: KPSE::FTell64
#endif
-diff -Nurd miktex-2.8.3541/Programs/MiKTeX/makex/internal.h
miktex-new-2.8.3541/Programs/MiKTeX/makex/internal.h
+diff -Nurd miktex-2.8.3541/Libraries/MiKTeX/PackageManager/CurlWebFile.cpp
miktex-2.8.3541-patched/Libraries/MiKTeX/PackageManager/CurlWebFile.cpp
+--- miktex-2.8.3541/Libraries/MiKTeX/PackageManager/CurlWebFile.cpp
2007-10-18 21:11:01.000000000 +0200
++++ miktex-2.8.3541-patched/Libraries/MiKTeX/PackageManager/CurlWebFile.cpp
2012-01-08 19:30:19.000000000 +0100
+@@ -271,7 +271,10 @@
+ NUMTOSTR(n));
+ }
+
+- if (n > 0)
++ // Documentation for curl_multi_fdset: if max_fd is -1, no file
++ // descriptors are set; in that case, do call curl_multi_perform as
++ // it's possible that file descriptors only appear later
++ if (n > 0 || maxfd == -1)
+ {
+ do
+ {
+diff -Nurd miktex-2.8.3541/Programs/MiKTeX/makex/internal.h
miktex-2.8.3541-patched/Programs/MiKTeX/makex/internal.h
--- miktex-2.8.3541/Programs/MiKTeX/makex/internal.h 2009-01-04
21:48:59.000000000 +0100
-+++ miktex-new-2.8.3541/Programs/MiKTeX/makex/internal.h 2011-03-23
12:55:57.000000000 +0100
++++ miktex-2.8.3541-patched/Programs/MiKTeX/makex/internal.h 2012-01-08
19:28:26.000000000 +0100
@@ -37,8 +37,6 @@
#include <cstdlib>
#include <string>
Index: miktex-tools.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/text/miktex-tools.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- miktex-tools.info 7 Jan 2012 21:26:20 -0000 1.1
+++ miktex-tools.info 8 Jan 2012 18:36:43 -0000 1.2
@@ -1,12 +1,12 @@
Package: miktex-tools
Version: 2.8.3541
-Revision: 3
+Revision: 4
Source: mirror:ctan:systems/win32/miktex/source/miktex-%v.tar.bz2
Source-MD5: edfc0fce88d135ecd67fe893685e76c7
PatchFile: miktex-tools.patch
-PatchFile-MD5: 5260d15a13fab383016f39d0eb1a2e35
+PatchFile-MD5: 92ac49af19746b24f4f235e711292740
License: GPL
-Depends: libpng14-shlibs
+Depends: libpng15-shlibs
BuildDepends: tetex-base, fink (>= 0.24.12), libpng15, cmake
BuildDependsOnly: False
CompileScript: <<
------------------------------------------------------------------------------
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
