[dillo] 3.0.0-0.1.20110804 pull hg snapshot of dillo 3 license change to GPLv3+ build against latest fltk (r
Andreas Bierfert
awjb at fedoraproject.org
Thu Aug 4 19:03:42 UTC 2011
commit df478404e606aa67160b76c77d1fb416e1a501f8
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date: Thu Aug 4 21:03:25 2011 +0200
3.0.0-0.1.20110804
pull hg snapshot of dillo 3
license change to GPLv3+
build against latest fltk (rhbz#545273)
fixes crash described in (rhbz#676710)
.gitignore | 1 +
dillo-0.8.0-nodebug.patch | 20 ----
dillo-0.8.6-i18n-misc-20060524.diff.bz2 | Bin 257918 -> 0 bytes
dillo-i18n-dso.patch | 11 --
dillo-i18n.desktop | 9 --
dillo.spec | 85 +++++++-----------
dillo3-dso.patch | 154 +++++++++++++++++++++++++++++++
sources | 2 +-
8 files changed, 189 insertions(+), 93 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a0e63ff..936e737 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
dillo-0.8.6.tar.bz2
+/dillo3-20110804.tar.bz2
diff --git a/dillo.spec b/dillo.spec
index 7eade0a..f371825 100644
--- a/dillo.spec
+++ b/dillo.spec
@@ -1,20 +1,19 @@
+%global hgdate 20110804
Name: dillo
-Version: 0.8.6
-Release: 15%{?dist}
+Version: 3.0.0
+Release: 0.1.%{hgdate}%{?dist}
Summary: Very small and fast GUI web browser
Group: Applications/Internet
-License: GPLv2+
+License: GPLv3+
URL: http://www.dillo.org/
-Source0: http://www.dillo.org/download/dillo-0.8.6.tar.bz2
+# hg clone http://hg.dillo.org/dillo dillo3
+# gtar -cjvf dillo3-20110804.tar.bz2 dillo3
+Source0: dillo3-%{hgdate}.tar.bz2
Source1: %{name}.desktop
Source2: %{name}.png
-Source3: %{name}-i18n.desktop
-Patch0: dillo-0.8.0-nodebug.patch
-#http://teki.jpn.ph/pc/software/index-e.shtml#dillo-i18n
-Patch1: dillo-0.8.6-i18n-misc-20060524.diff.bz2
-Patch2: dillo-i18n-dso.patch
+Patch0: dillo3-dso.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk+-devel
@@ -24,8 +23,9 @@ BuildRequires: libpng-devel >= 1.2.0
BuildRequires: libjpeg-devel = 6b
BuildRequires: openssl-devel
BuildRequires: libXft-devel
-BuildRequires: fltk-devel
+BuildRequires: fltk-devel >= 1.3.0
BuildRequires: gettext
+BuildRequires: autoconf automake
# #676710 dillo requires iso8859 fonts
Requires: wget
@@ -37,81 +37,62 @@ Dillo is a very small and fast web browser using GTK.
Currently: no frames,https,javascript.
%prep
-# i18n version
-%setup -q
-%patch0
-%patch1 -p1
-%patch2
-rm -rf ../%{name}-%{version}-i18n
-mv ../%{name}-%{version} ../%{name}-%{version}-i18n
-
-# normal version
-%setup -q
-%patch0
+%setup -q -n dillo3
-%build
-#normal
-%configure --disable-dependency-tracking --enable-ipv6 --enable-anti-alias \
---enable-meta-refresh --enable-ssl --disable-rpath --disable-dlgui
+%patch0 -p1 -b.dso
-# i18n
-cd ../%{name}-%{version}-i18n
-%configure --disable-dependency-tracking --enable-ipv6 --enable-anti-alias \
---enable-meta-refresh --enable-ssl --disable-rpath --disable-dlgui
+./autogen.sh
-cd ../%{name}-%{version}
-make %{?_smp_mflags}
+%build
+%configure --disable-dependency-tracking --enable-ipv6 --enable-ssl
-cd ../%{name}-%{version}-i18n
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-#i18n
-cd ../%{name}-%{version}-i18n/
make install DESTDIR=$RPM_BUILD_ROOT
rm -f doc/Makefile*
-#normal
-cd ../%{name}-%{version}/
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f doc/Makefile*
-
-# install i18n binary
-%{__install} -p -m0755 ../%{name}-%{version}-i18n/src/dillo \
-$RPM_BUILD_ROOT/%{_bindir}/dillo-i18n
-
-# do the rest
%{__install} -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications
desktop-file-install --vendor fedora \
--add-category X-Fedora \
--dir $RPM_BUILD_ROOT/%{_datadir}/applications \
%{SOURCE1}
-# i18n
-%{__install} -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications
-desktop-file-install --vendor fedora \
- --add-category X-Fedora \
- --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
- %{SOURCE3}
%{__install} -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/dillo.png
-%find_lang dillo
+# included with doc
+rm -fr $RPM_BUILD_ROOT%{_datadir}/doc/dillo
+
+# silence rpmlint and convert to utf8
+iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS
+iconv -f iso8859-1 -t utf-8 ChangeLog > ChangeLog.conv && mv -f ChangeLog.conv ChangeLog
+cd doc
+iconv -f iso8859-1 -t utf-8 Cache.txt > Cache.txt.conv && mv -f Cache.txt.conv Cache.txt
+iconv -f iso8859-1 -t utf-8 Cookies.txt > Cookies.txt.conv && mv -f Cookies.txt.conv Cookies.txt
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f dillo.lang
+%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README ChangeLog doc
%config(noreplace) %{_sysconfdir}/*
%{_bindir}/*
+%{_mandir}/man1/dillo.1.gz
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/dillo.png
%{_libdir}/%{name}
%changelog
+* Thu Aug 04 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.0.0-0.1.20110804
+- pull hg snapshot of dillo 3
+- license change to GPLv3+
+- build against latest fltk (rhbz#545273)
+- fixes crash described in (rhbz#676710)
+
* Sun Feb 13 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 0.8.6-14
- require iso8859 fonts (#676710)
diff --git a/dillo3-dso.patch b/dillo3-dso.patch
new file mode 100644
index 0000000..c6040e2
--- /dev/null
+++ b/dillo3-dso.patch
@@ -0,0 +1,154 @@
+diff -up dillo3/src/Makefile.am.orig dillo3/src/Makefile.am
+--- dillo3/src/Makefile.am.orig 2011-08-04 20:17:42.251368175 +0200
++++ dillo3/src/Makefile.am 2011-08-04 20:18:04.696678401 +0200
+@@ -19,7 +19,7 @@ dillo_LDADD = \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
+ @LIBJPEG_LIBS@ @LIBPNG_LIBS@ @LIBFLTK_LIBS@ @LIBZ_LIBS@ \
+- @LIBICONV_LIBS@ @LIBPTHREAD_LIBS@
++ @LIBICONV_LIBS@ @LIBPTHREAD_LIBS@ @LIBSSL_LIBS@ -lX11
+
+ dillo_SOURCES = \
+ dillo.cc \
+diff -up dillo3/test/Makefile.am.orig dillo3/test/Makefile.am
+--- dillo3/test/Makefile.am.orig 2011-08-04 20:21:04.162167537 +0200
++++ dillo3/test/Makefile.am 2011-08-04 20:22:22.805246975 +0200
+@@ -29,7 +29,7 @@ dw_anchors_test_LDADD = \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
+- @LIBFLTK_LIBS@
++ @LIBFLTK_LIBS@ -lX11
+
+ dw_example_SOURCES = dw_example.cc
+ dw_example_LDADD = \
+@@ -37,7 +37,7 @@ dw_example_LDADD = \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
+- @LIBFLTK_LIBS@
++ @LIBFLTK_LIBS@ -lX11
+
+ dw_find_test_SOURCES = dw_find_test.cc
+ dw_find_test_LDADD = \
+@@ -45,7 +45,7 @@ dw_find_test_LDADD = \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
+- @LIBFLTK_LIBS@
++ @LIBFLTK_LIBS@ -lX11
+
+ dw_links_SOURCES = dw_links.cc
+ dw_links_LDADD = \
+@@ -53,7 +53,7 @@ dw_links_LDADD = \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
+- @LIBFLTK_LIBS@
++ @LIBFLTK_LIBS@ -lX11
+
+ dw_links2_SOURCES = dw_links2.cc
+ dw_links2_LDADD = \
+@@ -61,7 +61,7 @@ dw_links2_LDADD = \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
+- @LIBFLTK_LIBS@
++ @LIBFLTK_LIBS@ -lX11
+
+ dw_images_simple_SOURCES = dw_images_simple.cc
+ dw_images_simple_LDADD = \
+@@ -69,7 +69,7 @@ dw_images_simple_LDADD = \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
+- @LIBFLTK_LIBS@
++ @LIBFLTK_LIBS@ -lX11
+
+ dw_images_scaled_SOURCES = dw_images_scaled.cc
+ dw_images_scaled_LDADD = \
+@@ -77,7 +77,7 @@ dw_images_scaled_LDADD = \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
+- @LIBFLTK_LIBS@
++ @LIBFLTK_LIBS@ -lX11
+
+ dw_images_scaled2_SOURCES = dw_images_scaled2.cc
+ dw_images_scaled2_LDADD = \
+@@ -85,7 +85,7 @@ dw_images_scaled2_LDADD = \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
+- @LIBFLTK_LIBS@
++ @LIBFLTK_LIBS@ -lX11
+
+ dw_lists_SOURCES = dw_lists.cc
+ dw_lists_LDADD = \
+@@ -93,7 +93,7 @@ dw_lists_LDADD = \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
+- @LIBFLTK_LIBS@
++ @LIBFLTK_LIBS@ -lX11
+
+ dw_table_aligned_SOURCES = dw_table_aligned.cc
+ dw_table_aligned_LDADD = \
+@@ -101,7 +101,7 @@ dw_table_aligned_LDADD = \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
+- @LIBFLTK_LIBS@
++ @LIBFLTK_LIBS@ -lX11
+
+ dw_table_SOURCES = dw_table.cc
+ dw_table_LDADD = \
+@@ -109,7 +109,7 @@ dw_table_LDADD = \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
+- @LIBFLTK_LIBS@
++ @LIBFLTK_LIBS@ -lX11
+
+ dw_border_test_SOURCES = dw_border_test.cc
+ dw_border_test_LDADD = \
+@@ -117,7 +117,7 @@ dw_border_test_LDADD = \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
+- @LIBFLTK_LIBS@
++ @LIBFLTK_LIBS@ -lX11
+
+
+ dw_imgbuf_mem_test_SOURCES = dw_imgbuf_mem_test.cc
+@@ -126,7 +126,7 @@ dw_imgbuf_mem_test_LDADD = \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
+- @LIBFLTK_LIBS@
++ @LIBFLTK_LIBS@ -lX11
+
+ dw_resource_test_SOURCES = dw_resource_test.cc
+ dw_resource_test_LDADD = \
+@@ -134,7 +134,7 @@ dw_resource_test_LDADD = \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
+- @LIBFLTK_LIBS@
++ @LIBFLTK_LIBS@ -lX11
+
+ dw_ui_test_SOURCES = \
+ dw_ui_test.cc \
+@@ -145,10 +145,10 @@ dw_ui_test_LDADD = \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
+- @LIBFLTK_LIBS@
++ @LIBFLTK_LIBS@ -lX11
+
+ fltk_browser_SOURCES = fltk_browser.cc
+-fltk_browser_LDADD = @LIBFLTK_LIBS@
++fltk_browser_LDADD = @LIBFLTK_LIBS@ -lX11
+
+ shapes_SOURCES = shapes.cc
+ shapes_LDADD = \
diff --git a/sources b/sources
index 09b0030..1632f43 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b65233d368bbd265a55effcf2c17f84b dillo-0.8.6.tar.bz2
+f114b902baa4491254b4e1a8cdbfc094 dillo3-20110804.tar.bz2
More information about the scm-commits
mailing list