[wxpropgrid] INITIAL CHECK-IN

Volker Fröhlich volter at fedoraproject.org
Sat Jan 28 10:06:41 UTC 2012 

commit 139c404298fe9708f607e01d516c74cda7b090d6
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Sat Jan 28 11:06:15 2012 +0100

    INITIAL CHECK-IN

 .gitignore                  |    1 +
 sources                     |    1 +
 wxpropgrid-includedir.patch |   22 ++++++++++
 wxpropgrid-linking.patch    |   12 +++++
 wxpropgrid-nosample.patch   |   75 ++++++++++++++++++++++++++++++++++
 wxpropgrid.spec             |   95 +++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 206 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..04d9553 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/wxpropgrid-1.4.15-src.tar.gz
diff --git a/sources b/sources
index e69de29..de2eaf0 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+f44b5cd6fd60718bacfabbf7994f1e93  wxpropgrid-1.4.15-src.tar.gz
diff --git a/wxpropgrid-includedir.patch b/wxpropgrid-includedir.patch
new file mode 100644
index 0000000..96aa892
--- /dev/null
+++ b/wxpropgrid-includedir.patch
@@ -0,0 +1,22 @@
+diff -Nur propgrid/Makefile.in propgrid-includedir/Makefile.in
+--- propgrid/Makefile.in	2011-02-27 09:26:00.000000000 +0100
++++ propgrid-includedir/Makefile.in	2011-10-31 23:47:05.107250519 +0100
+@@ -258,13 +258,14 @@
+ @COND_WX_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__propgrid_dll___targetsuf3)
+ @COND_WX_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__propgrid_dll___so_symlinks_uninst_cmd))
+ 
++# Volker Fröhlich
++#Better use wx-config --version
++
+ @COND_WX_SHARED_1 at install_propgrid_dll_headers: 
+ @COND_WX_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(prefix)
++ at COND_WX_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(prefix)/include/wx-2.8/wx/propgrid 
+ @COND_WX_SHARED_1@	for f in $(PROPGRID_DLL_HEADERS); do \
+- at COND_WX_SHARED_1@	if test ! -d $(DESTDIR)$(prefix)/`dirname $$f` ; then \
+- at COND_WX_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(prefix)/`dirname $$f`; \
+- at COND_WX_SHARED_1@	fi; \
+- at COND_WX_SHARED_1@	$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(prefix)/$$f; \
++ at COND_WX_SHARED_1@	$(INSTALL_DATA) -p $(srcdir)/$$f $(DESTDIR)$(prefix)/include/wx-2.8/wx/propgrid/`basename $$f`; \
+ @COND_WX_SHARED_1@	done
+ 
+ @COND_WX_SHARED_1 at uninstall_propgrid_dll_headers: 
diff --git a/wxpropgrid-linking.patch b/wxpropgrid-linking.patch
new file mode 100644
index 0000000..040f5d7
--- /dev/null
+++ b/wxpropgrid-linking.patch
@@ -0,0 +1,12 @@
+diff -Nur propgrid/Makefile.in propgrid-linking/Makefile.in
+--- propgrid/Makefile.in	2011-02-27 09:26:00.000000000 +0100
++++ propgrid-linking/Makefile.in	2011-12-13 00:49:58.631450204 +0100
+@@ -243,7 +243,7 @@
+ @COND_WX_SHARED_0@	done
+ 
+ @COND_WX_SHARED_1@$(srcdir)/lib/$(DLLPREFIX)wxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__propgrid_dll___targetsuf3): $(PROPGRID_DLL_OBJECTS)
+- at COND_WX_SHARED_1@	$(SHARED_LD_CXX) $@ $(PROPGRID_DLL_OBJECTS)  -L$(srcdir)/lib $(__propgrid_dll___macinstnamecmd) $(__propgrid_dll___importlib) $(__propgrid_dll___soname_flags) $(LDFLAGS)  $(WX_LIBS) $(LIBS)
++ at COND_WX_SHARED_1@	$(SHARED_LD_CXX) $@ $(PROPGRID_DLL_OBJECTS)  -L$(srcdir)/lib $(__propgrid_dll___macinstnamecmd) $(__propgrid_dll___importlib) $(__propgrid_dll___soname_flags) -Wl,--as-needed $(LDFLAGS) $(WX_LIBS) $(LIBS)
+ @COND_WX_SHARED_1@	
+ @COND_WX_SHARED_1@	$(__propgrid_dll___so_symlinks_cmd)
+ 
diff --git a/wxpropgrid-nosample.patch b/wxpropgrid-nosample.patch
new file mode 100644
index 0000000..dd0a832
--- /dev/null
+++ b/wxpropgrid-nosample.patch
@@ -0,0 +1,75 @@
+--- propgrid/Makefile.in	2011-02-27 09:26:00.000000000 +0100
++++ propgrid-nosample/Makefile.in	2011-10-31 08:17:39.434048604 +0100
+@@ -93,13 +93,6 @@
+ 	include/wx/propgrid/xh_propgrid.h
+ PROPGRIDSAMPLE_CXXFLAGS = -I$(srcdir)/include $(WX_CXXFLAGS) $(CPPFLAGS) \
+ 	$(CXXFLAGS)
+-PROPGRIDSAMPLE_OBJECTS =  \
+-	propgridsample_minimal.o \
+-	propgridsample_propgridsample.o \
+-	propgridsample_sampleprops.o \
+-	propgridsample_tests.o \
+-	propgridsample_xh_propgrid.o \
+-	$(__propgridsample___win32rc)
+ 
+ ### Conditionally set variables: ###
+ 
+@@ -195,7 +188,7 @@
+ 
+ ### Targets: ###
+ 
+-all: $(__propgrid_lib___depname) $(__propgrid_dll___depname) $(srcdir)/samples/propgridsample$(EXEEXT)
++all: $(__propgrid_lib___depname) $(__propgrid_dll___depname)
+ 
+ install: $(__install_propgrid_lib___depname) $(__install_propgrid_lib_headers___depname) $(__install_propgrid_dll___depname) $(__install_propgrid_dll_headers___depname)
+ 
+@@ -211,7 +204,6 @@
+ 	rm -f $(srcdir)/lib/$(DLLPREFIX)wxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__propgrid_dll___targetsuf3)
+ 	rm -f $(srcdir)/lib/$(LIBPREFIX)wxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)
+ 	rm -f $(srcdir)/lib/$(LIBPREFIX)wxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(srcdir)/lib/$(DLLPREFIX)wxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__propgrid_dll___targetsuf2)
+-	rm -f $(srcdir)/samples/propgridsample$(EXEEXT)
+ 
+ distclean: clean
+ 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+@@ -272,15 +264,6 @@
+ @COND_WX_SHARED_1@	rm -f $(DESTDIR)$(prefix)/$$f; \
+ @COND_WX_SHARED_1@	done
+ 
+-$(srcdir)/samples/propgridsample$(EXEEXT): $(PROPGRIDSAMPLE_OBJECTS) make_sample_dir_propgridsample $(__propgridsample___win32rc) $(__propgrid_lib___depname)
+-	$(CXX) -o $@ $(PROPGRIDSAMPLE_OBJECTS) -L$(srcdir)/lib  -L$(srcdir)/lib $(LDFLAGS_GUI) $(__propgridsample_RPATH) $(LDFLAGS)  -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) $(LIBS)
+-	
+-	$(__propgridsample___mac_setfilecmd)
+-	$(__propgridsample___os2_emxbindcmd)
+-
+-make_sample_dir_propgridsample: 
+-	@mkdir -p $(srcdir)/samples
+-
+ propgrid_lib_advprops.o: $(srcdir)/src/advprops.cpp
+ 	$(CXXC) -c -o $@ $(PROPGRID_LIB_CXXFLAGS) $(srcdir)/src/advprops.cpp
+ 
+@@ -323,25 +306,6 @@
+ propgrid_dll_props.o: $(srcdir)/src/props.cpp
+ 	$(CXXC) -c -o $@ $(PROPGRID_DLL_CXXFLAGS) $(srcdir)/src/props.cpp
+ 
+-propgridsample_minimal.o: $(srcdir)/samples/minimal.cpp
+-	$(CXXC) -c -o $@ $(PROPGRIDSAMPLE_CXXFLAGS) $(srcdir)/samples/minimal.cpp
+-
+-propgridsample_propgridsample.o: $(srcdir)/samples/propgridsample.cpp
+-	$(CXXC) -c -o $@ $(PROPGRIDSAMPLE_CXXFLAGS) $(srcdir)/samples/propgridsample.cpp
+-
+-propgridsample_sampleprops.o: $(srcdir)/samples/sampleprops.cpp
+-	$(CXXC) -c -o $@ $(PROPGRIDSAMPLE_CXXFLAGS) $(srcdir)/samples/sampleprops.cpp
+-
+-propgridsample_tests.o: $(srcdir)/samples/tests.cpp
+-	$(CXXC) -c -o $@ $(PROPGRIDSAMPLE_CXXFLAGS) $(srcdir)/samples/tests.cpp
+-
+-propgridsample_xh_propgrid.o: $(srcdir)/src/xh_propgrid.cpp
+-	$(CXXC) -c -o $@ $(PROPGRIDSAMPLE_CXXFLAGS) $(srcdir)/src/xh_propgrid.cpp
+-
+-propgridsample_sample_rc.o: $(srcdir)/samples/sample.rc
+-	$(WX_RESCOMP) -i$< -o$@  --include-dir $(srcdir)/include --include-dir $(srcdir)/samples
+-
+-
+ # Include dependency info, if present:
+ @IF_GNU_MAKE at -include ./.deps/*.d
+ 
diff --git a/wxpropgrid.spec b/wxpropgrid.spec
new file mode 100644
index 0000000..5292bea
--- /dev/null
+++ b/wxpropgrid.spec
@@ -0,0 +1,95 @@
+# Notice: wxpropgrid is part of wx 2.9 and will become obsolete
+# https://code.ros.org/trac/ros-pkg/ticket/5154
+
+Name:           wxpropgrid
+Version:        1.4.15
+Release:        1%{?dist}
+Summary:        A property sheet control for wxWidgets
+
+Group:          Applications/Engineering
+License:        wxWidgets
+URL:            http://wxpropgrid.sourceforge.net
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
+
+# Don't build samples
+Patch0:         %{name}-nosample.patch
+
+# Use the system-wide wx include directory and preserve timestamp
+# https://sourceforge.net/tracker/?func=detail&aid=3453329&group_id=133406&atid=727081
+#TODO: Is this path specific to Fedora?
+Patch1:         %{name}-includedir.patch
+
+# Link only as required; not all libraries from wx-config are actually used
+Patch2:         %{name}-linking.patch
+
+BuildRequires:  doxygen
+BuildRequires:  wxGTK-devel
+
+%description
+wxPropertyGrid is a property sheet control for wxWidgets. In other
+words, it is a specialized two-column grid for editing properties
+such as strings, numbers, flagsets, string arrays, and colors. 
+
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%prep
+%setup -q -n propgrid
+
+# Correct encoding and line ends
+iconv -f iso8859-1 -t utf-8 CHANGES.txt > CHANGES.txt.conv && mv CHANGES.txt.conv CHANGES.txt
+sed -i 's/\r//' CHANGES.txt samples/sample.xrc samples/sample.rc
+
+%patch0 -p1 -b .nosample~
+%patch1 -p1 -b .includedir~
+%patch2 -p1 -b .linking~
+
+# Solve the stall with Doxygen 1.7.6 in Rawhide
+# Doxygen 1.7.6.1 has a patch "to fix the hang
+# issue when non-empty INCLUDE_PATH was used"
+sed -i 's/^SEARCH_INCLUDES.*/SEARCH_INCLUDES = NO/' docs/Doxyfile
+
+
+%build
+%configure
+
+make %{?_smp_mflags}
+
+# Create up-to-date documentation
+pushd docs
+  doxygen -u
+  doxygen
+popd
+
+rm -f docs/html/installdox
+
+%install
+make install DESTDIR=%{buildroot}
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files
+# Upstream ships no license file
+# https://sourceforge.net/tracker/?func=detail&aid=3453325&group_id=133406&atid=727081
+%doc CHANGES.txt
+%{_libdir}/libwxcode_gtk2u_propgrid-2.8.so.*
+
+%files devel
+%doc samples docs/html
+%{_libdir}/libwxcode_gtk2u_propgrid-2.8.so
+%{_includedir}/wx-2.8/wx/propgrid
+
+%changelog
+* Tue Dec 13 2011 Volker Fröhlich <volker27 at gmx.at> - 1.4.15-1
+- Initial package

More information about the scm-commits mailing list