From d24ee7ec11413c874c8c3d0f106907a5861155fe Mon Sep 17 00:00:00 2001 From: sagitter Date: Mon, 28 Sep 2015 21:22:41 +0200 Subject: [PATCH] Bump to the new Engauge6 --- .gitignore | 1 + engauge-digitizer-LICENSE-gplv2+ | 280 ++++++++++++++++++++++++ engauge-digitizer.spec | 233 ++++++++++++++------ engauge-digitizer_fix_test_script.patch | 23 ++ engauge-digitizer_help_path.patch | 12 + sources | 2 +- 6 files changed, 483 insertions(+), 68 deletions(-) create mode 100644 engauge-digitizer-LICENSE-gplv2+ create mode 100644 engauge-digitizer_fix_test_script.patch create mode 100644 engauge-digitizer_help_path.patch diff --git a/.gitignore b/.gitignore index 430e1a2..998f86f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /engauge_5.2.tgz /digitizer-code-28de7dcffa2585192e3118a4861e9232fbb5a09b.zip +/engauge6-a251020d73afdd675d8c15f167b20c7eafd9cb2a.zip diff --git a/engauge-digitizer-LICENSE-gplv2+ b/engauge-digitizer-LICENSE-gplv2+ new file mode 100644 index 0000000..589ce5b --- /dev/null +++ b/engauge-digitizer-LICENSE-gplv2+ @@ -0,0 +1,280 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS diff --git a/engauge-digitizer.spec b/engauge-digitizer.spec index a50898e..e9c8ebc 100644 --- a/engauge-digitizer.spec +++ b/engauge-digitizer.spec @@ -1,35 +1,50 @@ -%global checkout 28de7dcffa2585192e3118a4861e9232fbb5a09b -%global date 20150115 - -## Define the Qt3/Qt4 qmake -%global qmake %{_libdir}/qt-3.3/bin/qmake -%global qmake4 %{_libdir}/qt4/bin/qmake-qt4 +%global checkout a251020d73afdd675d8c15f167b20c7eafd9cb2a +%global date 20150928 Name: engauge-digitizer Summary: Convert graphs or map files into numbers -Version: 5.2 -Release: 10.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} +Version: 6 +Release: 0.2.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} Group: Applications/Engineering License: GPLv2+ URL: http://digitizer.sourceforge.net/ -Source0: http://sourceforge.net/code-snapshots/git/d/di/digitizer/code.git/digitizer-code-%{checkout}.zip +Source0: https://github.com/markummitchell/engauge6/archive/%{checkout}.zip#/engauge6-%{checkout}.zip + +##Patch the test build script to use qmake-qt5 and default Fedora +##optimization flags for compilers +Patch0: %{name}_fix_test_script.patch + +##This patch re-sets the HELP menu path +Patch1: %{name}_help_path.patch + +Epoch: 1 +Provides: %{name} = 1:%{version}-%{release} +Obsoletes: %{name} < 5.2.11 ## Proposed in https://bugzilla.redhat.com/show_bug.cgi?id=1182409 Source1: %{name}.appdata.xml Source2: %{name}.svg Source3: %{name}-with-name.svg +Source4: %{name}-LICENSE-gplv2+ + ## Main building -BuildRequires: qt-devel >= 1:4.6.0, fftw-devel, desktop-file-utils -## BR for 'transpose' building -BuildRequires: qt3-devel, byacc, flex +BuildRequires: qt5-qtbase-devel, qt5-qttools-devel +BuildRequires: fftw-devel, log4cpp-devel, desktop-file-utils + +##Xvfb is needed to run a virtual X server used by tests +BuildRequires: xorg-x11-server-Xvfb + +##Doxygen for documentation +BuildRequires: doxygen %if 0%{?fedora} BuildRequires: libappstream-glib %endif %description -This open source, digitizing software converts an image file +Engauge6 is rewrited with Qt5. +This digitizing software converts an image file showing a graph or map, into numbers. The image file can come from a scanner, digital camera or screen-shot. The numbers can be read on the screen, @@ -38,86 +53,167 @@ The process starts with an image file containing a graph or map. The final result is digitized data that can be used by other tools such as Gnumeric. -%package transpose -Summary: The %{name} transpose utility +New features already added to Engauge6: + +- Undo/redo of all operations means recovering from mistakes and experimenting + with options is painless +- Wizard provides an interactive tutorial to explain the basic steps +- Wizard creates a checklist guide to interactively leads user through steps + from file import to file export +- Cubic spline interpolation between points gives more accurate curves with + fewer points +- Axes Checker briefly highlights the axes when they are defined or modified, + to reveal entry mistakes +- Graph coordinates can be specified as date and time value, or as degrees, + minutes and seconds +- All settings dialogs are resizable so they can be enlarged as necessary to + display more information +- Import by drag-and-drop +- Replacement of Qt3 (which is at its end of life) by Qt5 +- Much better zooming, with a fill mode that automatically zooms in on image + features, and rezooms when the application window is resized +- Color picking straight from the original image +- Uploadable error report generated when a programming error is encountered, + for identifying problems and improving user support +- Test suite for regression testing minimizes code breakage + as new features are added + +%package samples +Summary: Sample files for %{name} Group: Applications/Engineering -%description transpose -This utility often proves useful for post-processing the -output of Engauge Digitizer. Specifically, this utility can transpose the output -matrices found in the export files. +BuildArch: noarch +%description samples +This package contains several sample image files that may be imported into +Engauge Digitizer (http://digitizer.sourceforge.net). + +These files are listed below, with comments: + +- corners.png - Graph that lots of corners that would be painful to digitize manually +- gridlines.gif - Graph with gridlines that are easily removed by Engauge +- gridlines_log.gif - Another graph with gridlines that are easily removed by Engauge +- gridlines_log.src - Creates gridlines_log.gif in gnuplot using 'load' command (not an image!) +- inverse.jpg - Image of y/x function +- inverse.png - Same as inverse.jpg but in png format +- linlog.jpg - Graph with linear/logarithmic coordinates +- linlog.png - Same as linlog.jpg but in png format +- loglin.png - Graph with logarithmic/linear coordinates +- loglog.png - Graph with logarithmic/logarithmic coordinates +- normdist.jpg - Graph of normal distribution +- normdist.png - Same as normdist.jpg but in png format +- pointmatch.jpg - Graph with fuzzy points for playing with Point Match feature of Engauge +- pointplot.bmp - Graph with points that are easily captured by Point Match feature of Engauge, if + the Discretize settings are set to "Intensity 90 to 99" for the triangles, and + "Intensity 10 to 50" for the diamonds +- polarcircles.jpg - Polar plot for experimenting. No coordinates are displayed, so not very useful +- polarplot.jpg - Polar plot with cardioid pattern +- polarplot.png - Same as polarplot.jpg but in png format +- testcase.jpg - Simple graph that serves as an excellent starting point for the new user +- testcase.png - Same as testcase.jpg but in png format +- testcoords.jpg - Advanced graph used by developers to check the affine transformations in Engauge +- testcoords.sxd - Open Office document used to create testcoords.jpg (not an image!) +- usgs.png - Fictional map loosely based on U.S. Geological Survey topographic maps + +%package doc +Summary: HTML documentation of %{name} +Group: Applications/Engineering +BuildArch: noarch +%description doc +HTML documentation of %{name}. %prep -%setup -q -n digitizer-code-%{checkout} +%setup -q -n engauge6-%{checkout} -## Fix 'src/pointset.cpp' compilation error. -sed -i '36a #include ' src/digitdoc.cpp -sed -i '32a #include ' src/pointset.cpp +cp -p %{SOURCE4} LICENSE + +##Patch the test build script to use qmake-qt5 and default Fedora +##optimization flags for compilers +%patch0 -p0 +sed -e 's|RPM_OPT_FLAGS|"%{optflags}"|g' -i src/build_and_run_all_tests + +%patch1 -p0 %build -%qmake4 -makefile \ - QMAKE_CFLAGS="$RPM_OPT_FLAGS -D_REENTRANT -DQT_QT3SUPPORT_LIB -DQT3_SUPPORT -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB" \ - QMAKE_CXXFLAGS="$RPM_OPT_FLAGS -D_REENTRANT -DQT_QT3SUPPORT_LIB -DQT3_SUPPORT -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB" -make %{?_smp_mflags} - -pushd utility/transpose -%qmake -makefile \ - QMAKE_CFLAGS="$RPM_OPT_FLAGS -D_REENTRANT -DQT_THREAD_SUPPORT" \ - QMAKE_CXXFLAGS="$RPM_OPT_FLAGS -D_REENTRANT -DQT_THREAD_SUPPORT" - -## Fix Qt3 destination directories -sed -i '13a QTDIR=%{_libdir}/qt-3.3' Makefile +pushd src +qmake-qt5 -makefile engauge.pro \ + QMAKE_CFLAGS="$RPM_OPT_FLAGS" \ + QMAKE_CXXFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} popd +##Build HELP files +pushd help +qcollectiongenerator-qt5 engauge.qhcp -o engauge.qhc +mv engauge.qch ../bin/documentation +mv engauge.qhc ../bin/documentation +rm -f build +popd + +##Build HTML/Latex documentation files +pushd src +doxygen +popd + + %install mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/samples -mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/animation mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/img -mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/usermanual mkdir -p %{buildroot}%{_datadir}/applications mkdir -p %{buildroot}%{_datadir}/pixmaps mkdir -p %{buildroot}%{_datadir}/appdata mkdir -p %{buildroot}%{_bindir} install -p -m 755 bin/engauge %{buildroot}%{_bindir} -install -p -m 755 utility/transpose/transpose %{buildroot}%{_bindir} -install -p -m 644 samples/* %{buildroot}%{_datadir}/%{name}-%{version}/samples +pushd samples +install -p -m 644 gridlines.gif gridlines_log.gif gridlines_log.src inverse.jpg inverse.png \ + linlog.jpg linlog.png loglin.png loglog.png normdist.jpg normdist.png pointmatch.jpg \ + pointplot.bmp polarcircles.jpg polarplot.jpg polarplot.png testcase.jpg testcase.png \ + testcoords.jpg testcoords.sxd usgs.png %{buildroot}%{_datadir}/%{name}-%{version}/samples +popd + install -p -m 644 src/img/* %{buildroot}%{_datadir}/%{name}-%{version}/img -install -p -m 644 usermanual/* %{buildroot}%{_datadir}/%{name}-%{version}/usermanual -install -p -m 644 animation/* %{buildroot}%{_datadir}/%{name}-%{version}/animation install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps %if 0%{?fedora} install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata %endif -## Desktop file installation -desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{name}.desktop +##Make a .desktop file +mkdir -p %{buildroot}%{_datadir}/applications +cat > %{buildroot}%{_datadir}/applications/%{name}.desktop < /dev/null || : @@ -126,12 +222,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. /usr/bin/update-desktop-database &> /dev/null || : %files -%doc README RELEASE -%if 0%{?fedora} +%{!?_licensedir:%global license %doc} +%doc README.md help bin/documentation/engauge.qhc bin/documentation/engauge.qch %license LICENSE -%else -%doc LICENSE -%endif %{_bindir}/engauge %{_datadir}/pixmaps/%{name}*.svg %if 0%{?fedora} @@ -139,22 +232,28 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %endif %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}-%{version}/ +%exclude %{_datadir}/%{name}-%{version}/samples -%files transpose -%doc utility/transpose/README -%if 0%{?fedora} +%files samples +%{!?_licensedir:%global license %doc} +%doc samples/README +%license LICENSE +%dir %{_datadir}/%{name}-%{version} +%{_datadir}/%{name}-%{version}/samples + +%files doc +%{!?_licensedir:%global license %doc} +%doc README.md doc/doxygen/html %license LICENSE -%else -%doc LICENSE -%endif -%{_bindir}/transpose %changelog -* Wed Jun 17 2015 Fedora Release Engineering - 5.2-10.20150115git28de7d -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +* Mon Sep 28 2015 Antonio Trande - 1:6-0.2.20150928gita25102 +- Commit #a25102 +- Built HTML docs +- Tests performed -* Sat May 02 2015 Kalev Lember - 5.2-9.20150115git28de7d -- Rebuilt for GCC 5 C++11 ABI change +* Thu Sep 24 2015 Antonio Trande - 1:6-0.1.20150921git4f0c92 +- Bump to the new Engauge6 * Mon Feb 23 2015 Antonio Trande - 5.2-8.20150115git28de7d - Fixed Keywords key in .desktop file diff --git a/engauge-digitizer_fix_test_script.patch b/engauge-digitizer_fix_test_script.patch new file mode 100644 index 0000000..891d941 --- /dev/null +++ b/engauge-digitizer_fix_test_script.patch @@ -0,0 +1,23 @@ +--- src/build_and_run_all_tests.orig 2015-09-28 04:36:59.000000000 +0200 ++++ src/build_and_run_all_tests 2015-09-28 11:08:36.319383842 +0200 +@@ -31,7 +31,7 @@ + echo "Rebuilding..." + + # Make sure correct qt installation is being used, by looking for '5.' in the version number +-VERSION5=`qmake -v | grep '5\.'` ++VERSION5=`qmake-qt5 -v | grep '5\.'` + if [ -z "$VERSION5" ] + then + echo "Need Qt5"; +@@ -44,7 +44,9 @@ + for t in "${tests[@]}" + do + sed "s/TEST/$t/g" engauge_test_template.pro >engauge_test.pro +- qmake engauge_test.pro ++ qmake-qt5 -makefile engauge_test.pro \ ++ QMAKE_CFLAGS=RPM_OPT_FLAGS \ ++ QMAKE_CXXFLAGS=$RPM_OPT_FLAGS + make all 2>>$LOGFILE >/dev/null + ../bin/$t + if [ $argcount -ne 1 ] + diff --git a/engauge-digitizer_help_path.patch b/engauge-digitizer_help_path.patch new file mode 100644 index 0000000..9a192cb --- /dev/null +++ b/engauge-digitizer_help_path.patch @@ -0,0 +1,12 @@ +--- src/Help/HelpWindow.orig.cpp 2015-09-28 04:36:59.000000000 +0200 ++++ src/Help/HelpWindow.cpp 2015-09-28 15:01:45.483084067 +0200 +@@ -17,7 +17,7 @@ + setMinimumWidth (MIN_WIDTH); + setMinimumHeight (MIN_HEIGHT); + +- QString path = QApplication::applicationDirPath() + "/documentation/engauge.qhc"; ++ QString path = QApplication::applicationDirPath() + "/../share/doc/engauge-digitizer/engauge.qhc"; + QHelpEngine *helpEngine = new QHelpEngine (path); + helpEngine->setupData(); + + diff --git a/sources b/sources index ea3fa3d..33d199f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d8d5a7aae0e4072c7215ffb34e11da06 digitizer-code-28de7dcffa2585192e3118a4861e9232fbb5a09b.zip +6ee69a4e31c9d43c12d8466ad8b862b9 engauge6-a251020d73afdd675d8c15f167b20c7eafd9cb2a.zip