web
/
surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed missing resources

Browse Source
master
Marc Wäckerlin 9 years ago
parent 6680ec2e4f
commit a83f7ee97d
7 changed files with 63 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      README
  2. 2
      ax_check_qt.m4
  3. 4
      configure.ac
  4. 12
      debian/control.in
  5. 27
      src/makefile.am
  6. 27
      src/qbrowserlib/makefile.am
  7. 5
      swisssurfer.spec.in

4
README
Unescape View File

@ -1,5 +1,5 @@
SwissSurfer Light Weight Web Browser
SwissSurfer Light Weight Web Browser with PKCS#11 Token Support
A leight weight WebKit based Qt Webbrowser that supports PKCS#11
hardware smartcard token, i.e. it supports the SuisseID. Formerly
delivered as SwissBrowser on SwissStick.
delivered as SwissBrowser on SwissSign SwissStick.

2
ax_check_qt.m4
Unescape View File

@ -162,7 +162,7 @@ qrc_%.cxx: %.qrc
%.qm: %.ts
${LRELEASE} $< -qm [$][@]
#%.ts: ${LANGUAGE_FILES}
#%.ts: ${LANGUAGE_FILES:%=%}
# ${LUPDATE} -no-obsolete \
# -target-language ${@:${LANGUAGE_FILE_BASE}_%.ts=%} \
# -ts [$][@] $<

4
configure.ac
Unescape View File

@ -50,7 +50,9 @@ AX_PKG_REQUIRE([libpcscxx])
AX_PKG_REQUIRE([proxyface])
AX_PKG_REQUIRE([mrwcxx], [mrw-c++])
AC_CONFIG_FILES([src/qbrowserlib/makefile]) #src/designer/makefile
AC_CONFIG_FILES([src/languages.qrc])
AC_CONFIG_FILES([src/qbrowserlib/languages.qrc src/qbrowserlib/makefile])
#src/designer/makefile
# create output
AC_OUTPUT

12
debian/control.in vendored
Unescape View File

@ -1,18 +1,24 @@
Source: @PACKAGE_NAME@
Priority: extra
Maintainer: @AUTHOR@
Build-Depends: debhelper, subversion, pkg-config, autotools-dev, lsb-release , doxygen, graphviz, mscgen, qt5-default | qt4-default | qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools
Build-Depends: debhelper, subversion, pkg-config, autotools-dev, lsb-release , doxygen, graphviz, mscgen, qt5-default | qt4-default | qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, libpcsclite-dev
Package: @PACKAGE_NAME@
Section: libs
Section: lweb
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: swissbrowser
Conflicts: swissbrowser
Replaces: swissbrowser
Description: @DESCRIPTION@
@README_DEB@
Package: @PACKAGE_NAME@-dev
Section: libdevel
Section: devel
Architecture: any
Depends: @PACKAGE_NAME@ (= ${binary:Version})
Provides: swissbrowser-dev
Conflicts: swissbrowser-dev
Replaces: swissbrowser-dev
Description: @DESCRIPTION@ - Development Package
@README_DEB@

27
src/makefile.am
Unescape View File

@ -9,6 +9,8 @@
SUBDIRS = qbrowserlib #designer
bin_PROGRAMS = swisssurfer
LANGUAGE_FILE_BASE = swisssurfer
swisssurfer_MOCFILES = moc_authentication.cxx moc_certificate.cxx \
moc_logincertificate.cxx moc_smartcardauth.cxx \
moc_browser.cxx moc_editbookmarks.cxx \
@ -17,12 +19,27 @@ swisssurfer_MOCFILES = moc_authentication.cxx moc_certificate.cxx \
swisssurfer_UIFILES = ui_authentication.hxx ui_browser.hxx \
ui_certificate.hxx ui_editbookmarks.hxx \
ui_logincertificate.hxx ui_pinentry.hxx
swisssurfer_SOURCES = main.cxx ${swisssurfer_MOCFILES} ${swisssurfer_UIFILES}
swisssurfer_RESOURCES = qrc_resources.cxx qrc_languages.cxx
swisssurfer_TRANSLATIONS = ${LANGUAGE_FILE_BASE}_en.qm \
${LANGUAGE_FILE_BASE}_de.qm \
${LANGUAGE_FILE_BASE}_fr.qm \
${LANGUAGE_FILE_BASE}_it.qm
swisssurfer_TR_FILES = main.cxx
swisssurfer_SOURCES = ${swisssurfer_TR_FILES}
nodist_swisssurfer_SOURCES = ${swisssurfer_MOCFILES} \
${swisssurfer_UIFILES} \
${swisssurfer_TRANSLATIONS} \
${swisssurfer_RESOURCES}
swisssurfer_LDADD = qbrowserlib/libqbrowserlib.la
BUILT_SOURCES = ${swisssurfer_MOCFILES} ${swisssurfer_UIFILES}
BUILT_SOURCES = ${nodist_swisssurfer_SOURCES}
EXTRA_DIST_TR = ${swisssurfer_MOCFILES:moc_%.cxx=%.hxx} \
${swisssurfer_UIFILES:ui_%.hxx=%.ui}
EXTRA_DIST = ${EXTRA_DIST_TR} resources.qrc languages.qrc.in \
${swisssurfer_TRANSLATIONS:%.qm=%.ts} resources
EXTRA_DIST = authentication.hxx certificate.hxx logincertificate.hxx \
smartcardauth.hxx browser.hxx editbookmarks.hxx \
pinentry.hxx sslclientnetworkmanager.hxx
LANGUAGE_FILES = ${EXTRA_DIST_TR} ${swisssurfer_TR_FILES}
DISTCLEANFILES = qrc_languages.cxx ${BUILT_SOURCES}
MAINTAINERCLEANFILES = makefile.in

27
src/qbrowserlib/makefile.am
Unescape View File

@ -3,6 +3,8 @@
## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
LANGUAGE_FILE_BASE = qbrowserlib
qbrowserlibdir=${includedir}/qbrowserlib
qbrowserlib_HEADERS = $(libqbrowserlib_la_UIFILES) buttonlineedit.hxx \
downloadmanager.hxx executor.hxx log.hxx \
@ -25,11 +27,26 @@ libqbrowserlib_la_MOCFILES = moc_buttonlineedit.cxx moc_errorlog.cxx \
libqbrowserlib_la_UIFILES = ui_errorlog.hxx ui_log.hxx \
ui_saveorrun.hxx ui_settings.hxx \
ui_swisswebwidget.hxx
libqbrowserlib_la_SOURCES = certs.cxx log.cxx \
${libqbrowserlib_la_MOCFILES} \
${libqbrowserlib_la_UIFILES}
libqbrowserlib_la_RESOURCES = qrc_languages.cxx
libqbrowserlib_la_TRANSLATIONS = ${LANGUAGE_FILE_BASE}_en.qm \
${LANGUAGE_FILE_BASE}_de.qm \
${LANGUAGE_FILE_BASE}_fr.qm \
${LANGUAGE_FILE_BASE}_it.qm
libqbrowserlib_la_TR_FILES = certs.cxx log.cxx
libqbrowserlib_la_SOURCES = ${libqbrowserlib_la_TR_FILES}
nodist_libqbrowserlib_la_SOURCES = ${libqbrowserlib_la_MOCFILES} \
${libqbrowserlib_la_UIFILES} \
${libqbrowserlib_la_TRANSLATIONS} \
${libqbrowserlib_la_RESOURCES}
BUILT_SOURCES = ${nodist_libqbrowserlib_la_SOURCES}
EXTRA_DIST_TR = ${libqbrowserlib_la_MOCFILES:moc_%.cxx=%.hxx} \
${libqbrowserlib_la_UIFILES:ui_%.hxx=%.ui}
BUILT_SOURCES = ${libqbrowserlib_la_MOCFILES} \
${libqbrowserlib_la_UIFILES}
EXTRA_DIST = ${EXTRA_DIST_TR} languages.qrc.in \
${libqbrowserlib_la_TRANSLATIONS:%.qm=%.ts}
LANGUAGE_FILES = ${EXTRA_DIST_TR} ${libqbrowserlib_la_TR_FILES}
DISTCLEANFILES = qrc_languages.cxx ${BUILT_SOURCES}
MAINTAINERCLEANFILES = makefile.in

5
swisssurfer.spec.in
Unescape View File

@ -3,10 +3,13 @@ Name: @PACKAGE_NAME@
Version: @VERSION@
Release: @BUILD_NUMBER@%{?dist}
License: LGPL
Group: Development/Libraries/C++
Group: Applications/Internet
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gnupg, subversion, automake, autoconf, doxygen
Conflicts: swisssurfer
Provides: swisssurfer
Obsoletes: swisssurfer
%if 0%{?fedora} != 20
BuildRequires: graphviz
%endif

Write Preview
Loading…
Cancel
Save