diff --git a/.gitignore b/.gitignore index 9008e82..ae94d87 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xdrawchem-1.9.9.tar.gz +/xdrawchem-1.10.2-1.tar.gz diff --git a/sources b/sources index b36b02f..2d7dba0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6343d031b3ea19a6606831c89b8006b2 xdrawchem-1.9.9.tar.gz +SHA512 (xdrawchem-1.10.2-1.tar.gz) = cd72eb1f1b93a9ef398209c4dd89d1160a99ce2489dde58069e0e82c666592f0b2e6bba047ab1cf613394f208eb9d77d1e0a5bf9a1ee288a1eccf0aa93fc7b4f diff --git a/xdrawchem-cxxflags.patch b/xdrawchem-cxxflags.patch new file mode 100644 index 0000000..d995921 --- /dev/null +++ b/xdrawchem-cxxflags.patch @@ -0,0 +1,11 @@ +diff -up xdrawchem-qt5/xdrawchem.pro.orig xdrawchem-qt5/xdrawchem.pro +--- xdrawchem-qt5/xdrawchem.pro.orig 2017-01-09 13:25:32.000000000 +0100 ++++ xdrawchem-qt5/xdrawchem.pro 2019-11-27 12:57:54.007081078 +0100 +@@ -45,7 +45,6 @@ ringdir.files = ring/* + doc.path = $${PREFIX}/share/xdrawchem/doc + doc.files = doc/* + INSTALLS += ringdir doc +-QMAKE_CXXFLAGS_DEBUG += -O0 -g3 + + CONFIG += debug + QT += xml network core widgets printsupport network gui diff --git a/xdrawchem-duplicate-indexhtml.patch b/xdrawchem-duplicate-indexhtml.patch deleted file mode 100644 index d92b6dd..0000000 --- a/xdrawchem-duplicate-indexhtml.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up xdrawchem-1.9.9/doc/Makefile.am.di xdrawchem-1.9.9/doc/Makefile.am ---- xdrawchem-1.9.9/doc/Makefile.am.di 2005-05-19 00:52:48.000000000 +0200 -+++ xdrawchem-1.9.9/doc/Makefile.am 2014-03-15 01:57:21.444388925 +0100 -@@ -1,5 +1,5 @@ - htmldir = $(pkgdatadir)/doc --html_DATA = index.html arrowtool.png draw.html\ -+html_DATA = arrowtool.png draw.html\ - functions.html subscript.png \ - boldtool.png edit.html GPL.txt superscript.png\ - brackettool.png editmenu.html groupmenu.html symboltool.png\ diff --git a/xdrawchem-gcc43.patch b/xdrawchem-gcc43.patch deleted file mode 100644 index faefa98..0000000 --- a/xdrawchem-gcc43.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -up xdrawchem-1.9.9/xdrawchem/molinfodialog.cpp.gcc43 xdrawchem-1.9.9/xdrawchem/molinfodialog.cpp ---- xdrawchem-1.9.9/xdrawchem/molinfodialog.cpp.gcc43 2005-08-07 22:00:19.000000000 +0200 -+++ xdrawchem-1.9.9/xdrawchem/molinfodialog.cpp 2008-01-07 00:43:15.000000000 +0100 -@@ -1,3 +1,4 @@ -+#include - #include - #include - diff --git a/xdrawchem-gcc6.patch b/xdrawchem-gcc6.patch deleted file mode 100644 index 417ef55..0000000 --- a/xdrawchem-gcc6.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up xdrawchem-1.9.9/xdrawchem/molecule_obmol.cpp.gcc6 xdrawchem-1.9.9/xdrawchem/molecule_obmol.cpp ---- xdrawchem-1.9.9/xdrawchem/molecule_obmol.cpp.gcc6 2005-11-30 03:55:06.000000000 +0100 -+++ xdrawchem-1.9.9/xdrawchem/molecule_obmol.cpp 2016-02-17 16:03:30.652748203 +0100 -@@ -198,7 +198,7 @@ OBMol * Molecule::convertToOBMol() { - atom.SetType( type ); - - if (!obmol->AddAtom(atom)) -- return(false); -+ return(NULL); - atom.Clear(); - } - -@@ -212,7 +212,7 @@ OBMol * Molecule::convertToOBMol() { - bst = tmp_bond->Stereo(); - if (bst == STEREO_UP) flag |= OB_WEDGE_BOND; - if (bst == STEREO_DOWN) flag |= OB_HASH_BOND; -- if (!obmol->AddBond(start,end,order,flag)) return(false); -+ if (!obmol->AddBond(start,end,order,flag)) return(NULL); - } - - obmol->EndModify(); diff --git a/xdrawchem-include-header.patch b/xdrawchem-include-header.patch deleted file mode 100644 index f1c34b6..0000000 --- a/xdrawchem-include-header.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- xdrawchem-1.9.9/xdrawchem/application.cpp.compile 2005-11-16 12:01:55.000000000 +0900 -+++ xdrawchem-1.9.9/xdrawchem/application.cpp 2012-08-01 15:57:31.545768999 +0900 -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - using std::cout; - using std::endl; diff --git a/xdrawchem-link.patch b/xdrawchem-link.patch deleted file mode 100644 index 995d0d8..0000000 --- a/xdrawchem-link.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xdrawchem-1.9.9/configure.ac.l xdrawchem-1.9.9/configure.ac ---- xdrawchem-1.9.9/configure.ac.l 2005-11-30 03:55:06.000000000 +0100 -+++ xdrawchem-1.9.9/configure.ac 2014-03-15 01:50:03.992030308 +0100 -@@ -182,7 +182,7 @@ case "${host}" in - *linux*) - QT_LIBS="$QT_LIB" - if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then -- QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg" -+ QT_LIBS="$QT_LIBS -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg" - fi - ;; - diff --git a/xdrawchem-ob22.patch b/xdrawchem-ob22.patch deleted file mode 100644 index 8edcc04..0000000 --- a/xdrawchem-ob22.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -up xdrawchem-1.9.9/xdrawchem/application_ob.cpp.ob xdrawchem-1.9.9/xdrawchem/application_ob.cpp ---- xdrawchem-1.9.9/xdrawchem/application_ob.cpp.ob 2005-11-30 04:47:14.000000000 +0100 -+++ xdrawchem-1.9.9/xdrawchem/application_ob.cpp 2010-11-25 01:10:06.532000767 +0100 -@@ -45,23 +45,38 @@ void ApplicationWindow::OBGetFilters() { - readFilters.append(str1); - writeFilters.append(str1); - -- Formatpos pos; -+ int i; - OBFormat* pFormat; -- const char* str=NULL; -- while(OBConversion::GetNextFormat(pos,str,pFormat)) -+ vector pFormats=Conv.GetSupportedInputFormat(); -+ -+ for(i=0; i < pFormats.size(); i++) - { - //std::cout << " " << str << std::endl; -- if((pFormat->Flags() & NOTWRITABLE) && (pFormat->Flags() & NOTREADABLE)) -+ pFormat=Conv.FindFormat(pFormats[i].c_str()); -+ if(!pFormat) continue; -+ if(pFormat->Flags() & NOTREADABLE) -+ continue; -+ str1 = pFormats[i]; -+ myext = str1.left( str1.find(" -- ") ); -+ str1.append("(*."); -+ str1.append(myext); -+ str1.append(")"); -+ readFilters.append(str1); -+ } -+ -+ pFormats=Conv.GetSupportedOutputFormat(); -+ for(i=0; i < pFormats.size(); i++) -+ { -+ pFormat=Conv.FindFormat(pFormats[i].c_str()); -+ if(!pFormat) continue; -+ if(pFormat->Flags() & NOTWRITABLE) - continue; -- str1 = str; -+ str1 = pFormats[i]; - myext = str1.left( str1.find(" -- ") ); - str1.append("(*."); - str1.append(myext); - str1.append(")"); -- if ( (pFormat->Flags() & NOTREADABLE) == 0 ) -- readFilters.append(str1); -- if ( (pFormat->Flags() & NOTWRITABLE) == 0 ) -- writeFilters.append(str1); -+ writeFilters.append(str1); - } - - filters.sort(); -@@ -87,7 +102,7 @@ void ApplicationWindow::OBNewLoad(QStrin - OBFormat *inFormat = NULL; - - if (infilter.left(2) == "--") { -- inFormat = Conv.FormatFromExt(infile); -+ inFormat = Conv.FormatFromExt((const char *)infile); - if (inFormat == NULL) { - QMessageBox::warning( 0, tr("Could not determine file type"), - tr("Please select a file type from the list.") ); diff --git a/xdrawchem-warn.patch b/xdrawchem-warn.patch index f35ce94..274c14f 100644 --- a/xdrawchem-warn.patch +++ b/xdrawchem-warn.patch @@ -1,30 +1,70 @@ -diff -up xdrawchem-1.9.9/xdrawchem/bracket.cpp.warn xdrawchem-1.9.9/xdrawchem/bracket.cpp ---- xdrawchem-1.9.9/xdrawchem/bracket.cpp.warn 2005-06-09 20:23:57.000000000 +0200 -+++ xdrawchem-1.9.9/xdrawchem/bracket.cpp 2010-11-25 01:15:32.843249035 +0100 -@@ -253,7 +253,10 @@ Drawable * Bracket::FindNearestObject(DP - dist = dist1; - else - dist = dist2; -- delete tl, tr, bl, br; -+ delete tl; -+ delete tr; -+ delete bl; -+ delete br; - return this; - } - -diff -up xdrawchem-1.9.9/xdrawchem/gobject.cpp.warn xdrawchem-1.9.9/xdrawchem/gobject.cpp ---- xdrawchem-1.9.9/xdrawchem/gobject.cpp.warn 2005-06-13 15:02:09.000000000 +0200 -+++ xdrawchem-1.9.9/xdrawchem/gobject.cpp 2010-11-25 01:14:58.399000590 +0100 -@@ -227,7 +227,10 @@ Drawable * GraphicObject::FindNearestObj - dist = dist1; - else - dist = dist2; -- delete tl, tr, bl, br; -+ delete tl; -+ delete tr; -+ delete bl; -+ delete br; - return this; - } - +diff -up xdrawchem-qt5/xdrawchem/boat6.xpm.warn xdrawchem-qt5/xdrawchem/boat6.xpm +--- xdrawchem-qt5/xdrawchem/boat6.xpm.warn 2017-01-09 13:25:32.000000000 +0100 ++++ xdrawchem-qt5/xdrawchem/boat6.xpm 2019-11-28 14:36:43.994079602 +0100 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *boat6[] = { ++static const char *boat6[] = { + /* width height num_colors chars_per_pixel */ + " 24 24 2 1", + /* colors */ +diff -up xdrawchem-qt5/xdrawchem/down.xpm.warn xdrawchem-qt5/xdrawchem/down.xpm +--- xdrawchem-qt5/xdrawchem/down.xpm.warn 2017-01-09 13:25:32.000000000 +0100 ++++ xdrawchem-qt5/xdrawchem/down.xpm 2019-11-28 14:37:27.063468230 +0100 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *down[] = { ++static const char *down[] = { + /* width height num_colors chars_per_pixel */ + " 71 23 2 1", + /* colors */ +diff -up xdrawchem-qt5/xdrawchem/newman-anti.xpm.warn xdrawchem-qt5/xdrawchem/newman-anti.xpm +--- xdrawchem-qt5/xdrawchem/newman-anti.xpm.warn 2017-01-09 13:25:32.000000000 +0100 ++++ xdrawchem-qt5/xdrawchem/newman-anti.xpm 2019-11-28 14:37:36.423552688 +0100 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * newman_anti_xpm[] = { ++static const char * newman_anti_xpm[] = { + "57 60 2 1", + " c None", + ". c #000000", +diff -up xdrawchem-qt5/xdrawchem/newman-eclipse.xpm.warn xdrawchem-qt5/xdrawchem/newman-eclipse.xpm +--- xdrawchem-qt5/xdrawchem/newman-eclipse.xpm.warn 2017-01-09 13:25:32.000000000 +0100 ++++ xdrawchem-qt5/xdrawchem/newman-eclipse.xpm 2019-11-28 14:37:03.403254737 +0100 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * newman_eclipse_xpm[] = { ++static const char * newman_eclipse_xpm[] = { + "52 52 2 1", + " c None", + ". c #000000", +diff -up xdrawchem-qt5/xdrawchem/newman.xpm.warn xdrawchem-qt5/xdrawchem/newman.xpm +--- xdrawchem-qt5/xdrawchem/newman.xpm.warn 2017-01-09 13:25:32.000000000 +0100 ++++ xdrawchem-qt5/xdrawchem/newman.xpm 2019-11-28 14:37:52.983702117 +0100 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * newman_xpm[] = { ++static const char * newman_xpm[] = { + "36 38 2 1", + " c None", + ". c #000000", +diff -up xdrawchem-qt5/xdrawchem/p_orbital.xpm.warn xdrawchem-qt5/xdrawchem/p_orbital.xpm +--- xdrawchem-qt5/xdrawchem/p_orbital.xpm.warn 2017-01-09 13:25:32.000000000 +0100 ++++ xdrawchem-qt5/xdrawchem/p_orbital.xpm 2019-11-28 14:37:44.666627067 +0100 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * p_orbital_xpm[] = { ++static const char * p_orbital_xpm[] = { + "16 20 3 1", + " g None", + ". g #FFFFFF", +diff -up xdrawchem-qt5/xdrawchem/up.xpm.warn xdrawchem-qt5/xdrawchem/up.xpm +--- xdrawchem-qt5/xdrawchem/up.xpm.warn 2017-01-09 13:25:32.000000000 +0100 ++++ xdrawchem-qt5/xdrawchem/up.xpm 2019-11-28 14:37:14.391353885 +0100 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char *up[] = { ++static const char *up[] = { + /* width height num_colors chars_per_pixel */ + " 64 24 2 1", + /* colors */ diff --git a/xdrawchem.spec b/xdrawchem.spec index 6ab7956..1652f27 100644 --- a/xdrawchem.spec +++ b/xdrawchem.spec @@ -1,24 +1,20 @@ +%global tag 1.10.2-1 + Name: xdrawchem -Version: 1.9.9 -Release: 41%{?dist} +Version: 1.10.2 +Release: 1%{?dist} Summary: 2D chemical structures drawing tool -Source0: http://downloads.sourceforge.net/sourceforge/xdrawchem/%{name}-%{version}.tar.gz +Source0: https://github.com/bryanherger/xdrawchem/archive/%{tag}/%{name}-%{tag}.tar.gz Source1: %{name}.desktop -Patch0: %{name}-gcc43.patch -Patch1: %{name}-ob22.patch -Patch2: %{name}-warn.patch -Patch3: %{name}-include-header.patch -Patch4: %{name}-link.patch -Patch5: %{name}-duplicate-indexhtml.patch -Patch6: %{name}-gcc6.patch -URL: http://xdrawchem.sourceforge.net/ +# remove -O0 -g3 from CXXFLAGS +Patch0: %{name}-cxxflags.patch +Patch2: %{name}-warn.patch +URL: https://www.woodsidelabs.com/chemistry/xdrawchem.php License: GPLv2+ BuildRequires: gcc-c++ BuildRequires: desktop-file-utils -BuildRequires: libjpeg-devel -BuildRequires: libtool BuildRequires: openbabel-devel -BuildRequires: qt3-devel +BuildRequires: qt5-qtbase-devel Requires: hicolor-icon-theme %description @@ -29,45 +25,56 @@ and write MDL Molfiles and CML files to allow sharing between XDrawChem and other chemistry applications. %prep -%setup -q -%patch0 -p1 -b .gcc43 -%patch1 -p1 -b .ob +%setup -q -n %{name}-%{tag}/%{name}-qt5 +%patch0 -p1 -b .cxxflags %patch2 -p1 -b .warn -%patch3 -p1 -b .include -%patch4 -p1 -b .l -%patch5 -p1 -b .di -%patch6 -p1 -b .gcc6 -# re-run autoconf to enable aarch64 support (bug #1019042) -autoreconf -vif %build -%configure \ - --with-qtincdir=`pkg-config qt-mt --variable includedir` \ - --with-qtlibdir=`pkg-config qt-mt --variable libdir` \ - -%{__make} %{?_smp_mflags} +%qmake_qt5 PREFIX=%{_prefix} +%make_build %install -%{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%make_install INSTALL_ROOT=%{buildroot} # menu mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps install -Dpm 644 ring/xdrawchem-icon.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xdrawchem.png desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} -rm -f $RPM_BUILD_ROOT%{_datadir}/xdrawchem/caslist.txt +pushd %{buildroot}%{_datadir}/xdrawchem +rm \ + caslist.txt \ + CMakeLists.txt \ + COPYRIGHT.txt \ + GPL.txt \ + HISTORY.txt \ + +popd -%files +%find_lang %{name} --without-mo --with-qt + +%files -f %{name}.lang %license GPL.txt -%doc HISTORY.txt README.txt TODO.txt +%doc %{_datadir}/xdrawchem/doc %{_bindir}/xdrawchem -%{_datadir}/xdrawchem +%dir %{_datadir}/xdrawchem +%{_datadir}/xdrawchem/*.cml +%{_datadir}/xdrawchem/*.png +%{_datadir}/xdrawchem/*.xpm +%{_datadir}/xdrawchem/retro.txt +%{_datadir}/xdrawchem/xdrawchemrc %{_datadir}/applications/xdrawchem.desktop %{_datadir}/icons/hicolor/*/apps/xdrawchem.png %changelog +* Wed Nov 27 2019 Dominik Mierzejewski - 1.10.2-1 +- update to 1.10.2 (#1777310) +- update URLs +- upstream switched to QT5 +- drop obsolete patches +- mark translations using find_lang + * Sat Jul 27 2019 Fedora Release Engineering - 1.9.9-41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild