rpms/jna/devel jna-stringarray-return.patch, NONE, 1.1 jna.spec, 1.11, 1.12
Colin Walters
walters at fedoraproject.org
Wed Oct 15 05:09:15 UTC 2008
- Previous message (by thread): rpms/dnstracer/devel dnstracer.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.69, 1.70
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: walters
Update of /cvs/pkgs/rpms/jna/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29792
Modified Files:
jna.spec
Added Files:
jna-stringarray-return.patch
Log Message:
* Tue Oct 14 2008 Colin Walters <walters at redhat.com> - 3.0.4-10.svn729
- Add patch to support String[] returns
jna-stringarray-return.patch:
--- NEW FILE jna-stringarray-return.patch ---
diff -ur jna-3.0.4-svn729/src/com/sun/jna/Function.java jna-3.0.4-svn729.orig/src/com/sun/jna/Function.java
--- jna-3.0.4-svn729/src/com/sun/jna/Function.java 2008-10-14 19:47:44.000000000 -0400
+++ jna-3.0.4-svn729.orig/src/com/sun/jna/Function.java 2008-10-14 19:48:00.000000000 -0400
@@ -314,6 +314,20 @@
String s = invokeString(callingConvention, args, true);
result = s != null ? new WString(s) : null;
}
+ else if (returnType == String[].class) {
+ Pointer tmp = invokePointer(callingConvention, args);
+ if (tmp != null)
+ result = tmp.getStringArray(0);
+ else
+ result = null;
+ }
+ else if (returnType == WString[].class) {
+ Pointer tmp = invokePointer(callingConvention, args);
+ if (tmp != null)
+ result = tmp.getStringArray(0, true);
+ else
+ result = null;
+ }
else if (Pointer.class.isAssignableFrom(returnType)) {
result = invokePointer(callingConvention, args);
}
Only in jna-3.0.4-svn729.orig/src/com/sun/jna: Function.java~
Only in jna-3.0.4-svn729/src/com/sun/jna: Function.java.nativemapped-array
Index: jna.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jna/devel/jna.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jna.spec 2 Oct 2008 03:33:42 -0000 1.11
+++ jna.spec 15 Oct 2008 05:08:44 -0000 1.12
@@ -1,6 +1,6 @@
Name: jna
Version: 3.0.4
-Release: 9.svn729%{?dist}
+Release: 10.svn729%{?dist}
Summary: Pure Java access to native libraries
Group: Development/Libraries
@@ -21,6 +21,8 @@
Patch2: jna-tests-headless.patch
# https://jna.dev.java.net/issues/show_bug.cgi?id=90
Patch3: jna-3.0.4-nativemapped-array.patch
+# https://jna.dev.java.net/issues/show_bug.cgi?id=XXX
+Patch4: jna-stringarray-return.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: java-devel >= 1.6 ant jpackage-utils ant-nodeps
@@ -53,6 +55,7 @@
sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH1} | patch -p1
%patch2 -p1 -b .tests-headless
%patch3 -p1 -b .nativemapped-array
+%patch4 -p1 -b .stringarray-return
# all java binaries must be removed from the sources
find . -name '*.jar' -exec rm -f '{}' \;
@@ -109,6 +112,9 @@
%changelog
+* Tue Oct 14 2008 Colin Walters <walters at redhat.com> - 3.0.4-10.svn729
+- Add patch to support String[] returns
+
* Wed Oct 01 2008 Colin Walters <walters at redhat.com> - 3.0.4-9.svn729
- Add new patch to support NativeMapped[] which I want
- Previous message (by thread): rpms/dnstracer/devel dnstracer.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/gnome-settings-daemon/devel gnome-settings-daemon.spec, 1.69, 1.70
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list