From f8ba70457296639a503c9bf61dac7e993a7a2e6a Mon Sep 17 00:00:00 2001 From: Teus Benschop Date: Tue, 13 Nov 2018 00:56:15 +0700 Subject: Import bibletime_2.11.2-8.debian.tar.xz [dgit import tarball bibletime 2.11.2-8 bibletime_2.11.2-8.debian.tar.xz] --- patches/desktop_translation.patch | 20 ++++++++++++++++++++ patches/desktopkeywords.patch | 11 +++++++++++ patches/mime_exec.patch | 13 +++++++++++++ patches/s390x-ftbfs.patch | 16 ++++++++++++++++ patches/series | 4 ++++ 5 files changed, 64 insertions(+) create mode 100644 patches/desktop_translation.patch create mode 100644 patches/desktopkeywords.patch create mode 100644 patches/mime_exec.patch create mode 100644 patches/s390x-ftbfs.patch create mode 100644 patches/series (limited to 'patches') diff --git a/patches/desktop_translation.patch b/patches/desktop_translation.patch new file mode 100644 index 0000000..fb66382 --- /dev/null +++ b/patches/desktop_translation.patch @@ -0,0 +1,20 @@ +Description: fix wrongly encoded translations +Author: Paul Martrenchar + +--- a/cmake/platforms/linux/bibletime.desktop.cmake ++++ b/cmake/platforms/linux/bibletime.desktop.cmake +@@ -1,12 +1,12 @@ + [Desktop Entry] + Comment=An easy to use bible study tool + Comment[C]=An easy to use bible study tool +-Comment[cs]=Snadno pouiteln n�troj pro studium Bible ++Comment[cs]=Snadno použitelný nástroj pro studium Bible + Comment[da]=Et letanvendeligt bibelstudieprogram + Comment[de]=Ein einfach zu benutzendes Bibelprogramm + Comment[et]=Lihtne Piibliuurimise vahend + Comment[fi]=Helppokäyttöinen raamatunlukuohjelmisto +-Comment[fr]=Un outil d'éde biblique facile àtiliser ++Comment[fr]=Un outil d'étude biblique facile à utiliser + Comment[it]=Un semplice strumento per studiare la Bibbia + Exec=bibletime + Icon=bibletime diff --git a/patches/desktopkeywords.patch b/patches/desktopkeywords.patch new file mode 100644 index 0000000..e6fa7ae --- /dev/null +++ b/patches/desktopkeywords.patch @@ -0,0 +1,11 @@ +Description: add some keywords to desktop file +Author: Daniel Glassey + +--- a/cmake/platforms/linux/bibletime.desktop.cmake ++++ b/cmake/platforms/linux/bibletime.desktop.cmake +@@ -23,4 +23,5 @@ + Terminal=false + Type=Application + Categories=X-Bible;X-Religion;Literature;Education;Dictionary;Qt; ++Keywords=bible;study;religion;literature;education; + DocPath=bibletime/handbook/index.html diff --git a/patches/mime_exec.patch b/patches/mime_exec.patch new file mode 100644 index 0000000..626c538 --- /dev/null +++ b/patches/mime_exec.patch @@ -0,0 +1,13 @@ +Description: remove empty MimeType entry +Author: Daniel Glassey + +--- a/cmake/platforms/linux/bibletime.desktop.cmake ++++ b/cmake/platforms/linux/bibletime.desktop.cmake +@@ -10,7 +10,6 @@ + Comment[it]=Un semplice strumento per studiare la Bibbia + Exec=bibletime + Icon=bibletime +-MimeType= + Name=BibleTime @BT_VERSION@ + Name[C]=BibleTime @BT_VERSION@ + Name[cs]=BibleTime @BT_VERSION@ diff --git a/patches/s390x-ftbfs.patch b/patches/s390x-ftbfs.patch new file mode 100644 index 0000000..86a23c5 --- /dev/null +++ b/patches/s390x-ftbfs.patch @@ -0,0 +1,16 @@ +Description: build without pie, fixes FTBFS on s390x +Author: Dimitri John Ledkov + +Index: bibletime-2.10.1/CMakeLists.txt +=================================================================== +--- bibletime-2.10.1.orig/CMakeLists.txt ++++ bibletime-2.10.1/CMakeLists.txt +@@ -205,7 +205,7 @@ IF(MSVC) + SET(CMAKE_CXX_FLAGS_DEBUG "-DNO_DBUS -DSWUSINGDLL /MDd /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE /Zc:wchar_t /Od") + SET(BibleTime_LDFLAGS "${BibleTime_LDFLAGS} /SUBSYSTEM:WINDOWS") + ELSE() +- SET(BibleTime_CFLAGS "${BibleTime_CFLAGS} -Wextra -fpie -fexceptions") ++ SET(BibleTime_CFLAGS "${BibleTime_CFLAGS} -Wextra -fexceptions") + SET(CMAKE_CXX_FLAGS_RELEASE "-O2") + SET(CMAKE_CXX_FLAGS_DEBUG "-ggdb") + IF(APPLE) diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..fc4ff2a --- /dev/null +++ b/patches/series @@ -0,0 +1,4 @@ +# s390x-ftbfs.patch +# desktopkeywords.patch +# mime_exec.patch +# desktop_translation.patch -- cgit v1.2.3