[packages/libgphoto2] - updated to 2.5.9 - updated pl.po-update patch - removed obsolete format patch
qboosh
qboosh at pld-linux.org
Fri Nov 20 17:59:20 CET 2015
commit bb37a97bb2cae378bd65ed15d5731cf01b1759a1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Nov 20 17:59:41 2015 +0100
- updated to 2.5.9
- updated pl.po-update patch
- removed obsolete format patch
libgphoto2-format.patch | 11 --
libgphoto2-pl.po-update.patch | 344 ++++++++++++++++++++++++++++++++----------
libgphoto2.spec | 10 +-
3 files changed, 269 insertions(+), 96 deletions(-)
---
diff --git a/libgphoto2.spec b/libgphoto2.spec
index 9b2ef68..764443b 100644
--- a/libgphoto2.spec
+++ b/libgphoto2.spec
@@ -11,15 +11,14 @@ Summary(es.UTF-8): Foto GNU (gphoto) Release 2
Summary(pl.UTF-8): Biblioteki obsługi kamer cyfrowych
Summary(pt_BR.UTF-8): GNU Photo - programa GNU para câmeras digitais
Name: libgphoto2
-Version: 2.5.8
+Version: 2.5.9
Release: 1
License: LGPL v2+
Group: Libraries
Source0: http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
-# Source0-md5: 873ab01aced49c6b92a98e515db5dcef
+# Source0-md5: 9b17521ac7fa9d13146d62917cd67a09
Patch0: %{name}-mode-owner-group.patch
Patch1: %{name}-pl.po-update.patch
-Patch2: %{name}-format.patch
URL: http://www.gphoto.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.9
@@ -170,19 +169,18 @@ w przestrzeni użytkownika.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%{__rm} po/stamp-po libgphoto2_port/po/stamp-po
%build
# supplied libtool is broken (relink)
%{__libtoolize}
-%{__aclocal} -I auto-m4 -I m4m
+%{__aclocal} -I auto-m4 -I gphoto-m4
%{__autoconf}
%{__automake}
cd libgphoto2_port
%{__libtoolize}
-%{__aclocal} -I auto-m4 -I m4
+%{__aclocal} -I auto-m4 -I gphoto-m4
%{__autoconf}
%{__automake}
cd ..
diff --git a/libgphoto2-format.patch b/libgphoto2-format.patch
deleted file mode 100644
index 5ccf568..0000000
--- a/libgphoto2-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgphoto2-2.5.8/camlibs/ptp2/chdk.c.orig 2015-06-17 23:20:45.000000000 +0200
-+++ libgphoto2-2.5.8/camlibs/ptp2/chdk.c 2015-07-08 21:26:03.382704271 +0200
-@@ -1128,7 +1128,7 @@
- if (ret != GP_OK) return ret;
-
- lua = malloc(strlen(luascript)+1);
-- sprintf(lua,luascript); /* This expands the %q inside the string too ... do not optimize away. */
-+ sprintf(lua,luascript,""); /* This expands the %q inside the string too ... do not optimize away. */
- ret = chdk_generic_script_run (params, lua, &table, &retint, context);
- free (lua);
- GP_LOG_D("rlib_shoot returned table %s, retint %d\n", table, retint);
diff --git a/libgphoto2-pl.po-update.patch b/libgphoto2-pl.po-update.patch
index 95b4b61..63095fd 100644
--- a/libgphoto2-pl.po-update.patch
+++ b/libgphoto2-pl.po-update.patch
@@ -1,109 +1,295 @@
---- libgphoto2-2.5.8/po/pl.po.orig 2015-07-08 21:00:29.429435311 +0200
-+++ libgphoto2-2.5.8/po/pl.po 2015-07-08 21:07:33.112750864 +0200
-@@ -6745,7 +6745,7 @@
+--- libgphoto2-2.5.9/po/pl.po.orig 2015-11-20 15:42:19.513910630 +0100
++++ libgphoto2-2.5.9/po/pl.po 2015-11-20 15:50:05.047234260 +0100
+@@ -5,10 +5,10 @@
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: libgphoto2 2.5.8\n"
++"Project-Id-Version: libgphoto2 2.5.9\n"
+ "Report-Msgid-Bugs-To: gphoto-devel at lists.sourceforge.net\n"
+ "POT-Creation-Date: 2015-11-18 21:16+0100\n"
+-"PO-Revision-Date: 2015-07-22 17:04+0200\n"
++"PO-Revision-Date: 2015-11-19 20:49+0100\n"
+ "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
+ "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
+ "Language: pl\n"
+@@ -4777,14 +4777,12 @@
+ msgstr "sRAW"
- #: camlibs/ptp2/config.c:6422
- msgid "WLAN GUID"
--msgstr ""
-+msgstr "WLAN GUID"
+ #: camlibs/ptp2/config.c:2246
+-#, fuzzy
+ msgid "Smaller JPEG"
+-msgstr "Mniejszy JPEG (S2)"
++msgstr "Mniejszy JPEG"
- #: camlibs/ptp2/config.c:6423
- msgid "Enable Image Comment"
-@@ -6840,7 +6840,7 @@
+ #: camlibs/ptp2/config.c:2247
+-#, fuzzy
+ msgid "Tiny JPEG"
+-msgstr "Malutki JPEG (S3)"
++msgstr "Malutki JPEG"
- #: camlibs/ptp2/config.c:6453
- msgid "CHDK"
--msgstr ""
-+msgstr "CHDK"
+ #: camlibs/ptp2/config.c:2249
+ msgid "mRAW + Large Fine JPEG"
+@@ -4835,34 +4833,28 @@
+ msgstr "sRAW + mały normalny JPEG"
+
+ #: camlibs/ptp2/config.c:2272
+-#, fuzzy
+ msgid "RAW + Smaller JPEG"
+-msgstr "RAW + mały dobry JPEG (S2)"
++msgstr "RAW + mniejszy JPEG"
+
+ #: camlibs/ptp2/config.c:2273
+-#, fuzzy
+ msgid "mRAW + Smaller JPEG"
+-msgstr "mRAW + mały dobry JPEG (S2)"
++msgstr "mRAW + mniejszy JPEG"
+
+ #: camlibs/ptp2/config.c:2274
+-#, fuzzy
+ msgid "sRAW + Smaller JPEG"
+-msgstr "sRAW + mały dobry JPEG (S2)"
++msgstr "sRAW + mniejszy JPEG"
- #: camlibs/ptp2/config.c:6463
- msgid "Image Format SD"
-@@ -6855,9 +6855,8 @@
- msgstr "Format zdjęć Ext HD"
+ #: camlibs/ptp2/config.c:2275
+-#, fuzzy
+ msgid "RAW + Tiny JPEG"
+-msgstr "RAW + malutki JPEG (S3)"
++msgstr "RAW + malutki JPEG"
- #: camlibs/ptp2/config.c:6473
+ #: camlibs/ptp2/config.c:2276
-#, fuzzy
- msgid "Movie ISO Speed"
--msgstr "Czułość ISO"
-+msgstr "Czułość ISO filmu"
+ msgid "mRAW + Tiny JPEG"
+-msgstr "mRAW + malutki JPEG (S3)"
++msgstr "mRAW + malutki JPEG"
+
+ #: camlibs/ptp2/config.c:2277
+-#, fuzzy
+ msgid "sRAW + Tiny JPEG"
+-msgstr "sRAW + malutki JPEG (S3)"
++msgstr "sRAW + malutki JPEG"
+
+ #: camlibs/ptp2/config.c:2302 camlibs/ptp2/ptp.c:5435
+ msgid "Continuous"
+@@ -4908,9 +4900,9 @@
- #: camlibs/ptp2/config.c:6477 camlibs/ptp2/ptp.c:4601
- msgid "ISO Auto"
-@@ -6988,9 +6987,8 @@
- msgstr "Liczba F"
+ #: camlibs/ptp2/config.c:2648 camlibs/ptp2/config.c:2676
+ #: camlibs/ptp2/config.c:3465 camlibs/ptp2/config.c:3510
+-#, fuzzy, c-format
++#, c-format
+ msgid "Time"
+-msgstr "Samowyzwalacz"
++msgstr "Czas"
- #: camlibs/ptp2/config.c:6532
+ #: camlibs/ptp2/config.c:2652
+ #, c-format
+@@ -5238,7 +5230,6 @@
+ msgstr "AF dla dynamicznego obszaru"
+
+ #: camlibs/ptp2/config.c:3154
-#, fuzzy
- msgid "Movie F-Number"
--msgstr "Liczba F"
-+msgstr "Liczba F filmu"
+ msgid "Group-dynamic AF"
+ msgstr "AF dla dynamicznej grupy"
+
+@@ -5433,7 +5424,7 @@
+ #: camlibs/ptp2/config.c:3461 camlibs/ptp2/config.c:3506
+ #, c-format
+ msgid "x 200"
+-msgstr ""
++msgstr "x 200"
- #: camlibs/ptp2/config.c:6533 camlibs/ptp2/ptp.c:4505
- msgid "Flexible Program"
-@@ -7009,9 +7007,8 @@
- msgstr "Tryb ogniskowania 2"
+ #: camlibs/ptp2/config.c:3770
+ msgid "Face-priority AF"
+@@ -8271,64 +8262,56 @@
+ msgstr "Informacje o prawach autorskich"
- #: camlibs/ptp2/config.c:6541
+ #: camlibs/ptp2/ptp.c:4135
-#, fuzzy
- msgid "Continuous AF"
--msgstr "Ciągła"
-+msgstr "Ciągły AF"
+ msgid "Supported Streams"
+-msgstr "Obsługiwane rozmiary miniaturek"
++msgstr "Obsługiwane strumienie"
- #: camlibs/ptp2/config.c:6542 camlibs/ptp2/config.c:6543
- #: camlibs/ptp2/ptp.c:4094 camlibs/ptp2/ptp.c:4281
-@@ -7093,9 +7090,8 @@
- msgstr "Prędkość migawki 2"
+ #: camlibs/ptp2/ptp.c:4136
+-#, fuzzy
+ msgid "Enabled Streams"
+-msgstr "Nieprawidłowy status"
++msgstr "Strumienie włączone"
- #: camlibs/ptp2/config.c:6572
+ #: camlibs/ptp2/ptp.c:4137
-#, fuzzy
- msgid "Movie Shutter Speed 2"
--msgstr "Prędkość migawki 2"
-+msgstr "Prędkość migawki filmu 2"
+ msgid "Video Format"
+-msgstr "Format daty"
++msgstr "Format filmu"
- #: camlibs/ptp2/config.c:6576 camlibs/ptp2/config.c:6577
#: camlibs/ptp2/ptp.c:4138
-@@ -7424,9 +7420,8 @@
- msgstr "Przycisk AF On"
+-#, fuzzy
+ msgid "Video Resolution"
+ msgstr "Rozdzielczość filmu"
- #: camlibs/ptp2/config.c:6742
+ #: camlibs/ptp2/ptp.c:4139
-#, fuzzy
- msgid "Movie High ISO Noise Reduction"
--msgstr "Redukcja szumów przy dużym ISO"
-+msgstr "Redukcja szumów filmu przy dużym ISO"
+ msgid "Video Quality"
+ msgstr "Jakość filmu"
- #: camlibs/ptp2/config.c:6744
- msgid "Maximum continuous release"
-@@ -7547,9 +7542,8 @@
- msgstr "Niestety ten aparat Canon nie obsługuje funkcji Canon EOS capture"
+ #: camlibs/ptp2/ptp.c:4140
+ msgid "Video Framerate"
+-msgstr ""
++msgstr "Szybkość klatek filmu"
- #: camlibs/ptp2/library.c:2911 camlibs/ptp2/library.c:3810
+ #: camlibs/ptp2/ptp.c:4141
-#, fuzzy
- msgid "Canon EOS Half-Press failed"
--msgstr "Canon EOS Capture nie powiodło się"
-+msgstr "Canon EOS Half-Press nie powiodło się"
+ msgid "Video Contrast"
+-msgstr "Kontrast"
++msgstr "Kontrast filmu"
- #: camlibs/ptp2/library.c:2915 camlibs/ptp2/library.c:2978
- #: camlibs/ptp2/library.c:3817 camlibs/ptp2/library.c:4035
-@@ -7563,19 +7557,16 @@
+ #: camlibs/ptp2/ptp.c:4142
+-#, fuzzy
+ msgid "Video Brightness"
+-msgstr "Jasność"
++msgstr "Jasność filmu"
- #: camlibs/ptp2/library.c:2934 camlibs/ptp2/library.c:2946
- #: camlibs/ptp2/library.c:3836 camlibs/ptp2/library.c:3848
+ #: camlibs/ptp2/ptp.c:4143
-#, fuzzy
- msgid "Canon EOS Half-Release failed"
--msgstr "Canon EOS Capture nie powiodło się"
-+msgstr "Canon EOS Half-Release nie powiodło się"
+ msgid "Audio Format"
+-msgstr "Format daty"
++msgstr "Format dźwięku"
- #: camlibs/ptp2/library.c:2939 camlibs/ptp2/library.c:3841
+ #: camlibs/ptp2/ptp.c:4144
+ msgid "Audio Bitrate"
+-msgstr ""
++msgstr "Przepływność dźwięku"
+
+ #: camlibs/ptp2/ptp.c:4145
+ msgid "Audio Samplingrate"
+-msgstr ""
++msgstr "Częstotliwość próbkowania dźwięku"
+
+ #: camlibs/ptp2/ptp.c:4146
+ msgid "Audio Bits per sample"
+-msgstr ""
++msgstr "Liczba bitów na próbkę dźwięku"
+
+ #: camlibs/ptp2/ptp.c:4147
+ msgid "Audio Volume"
+-msgstr ""
++msgstr "Głośność dźwięku"
+
+ #: camlibs/ptp2/ptp.c:4156
+ msgid "Date Time Stamp Format"
+@@ -9761,7 +9744,6 @@
+ msgstr "Nieznany(%04x)"
+
+ #: camlibs/ptp2/ptp.c:5702
+-#, fuzzy
+ msgid "Get device info"
+ msgstr "Pobranie informacji o urządzeniu"
+
+@@ -9875,43 +9857,39 @@
+
+ #: camlibs/ptp2/ptp.c:5731
+ msgid "Start Enumerate Handles"
+-msgstr ""
++msgstr "Rozpoczęcie numerowania uchwytów"
+
+ #: camlibs/ptp2/ptp.c:5732
+ msgid "Enumerate Handles"
+-msgstr ""
++msgstr "Numerowanie uchwytów"
+
+ #: camlibs/ptp2/ptp.c:5733
+ msgid "Stop Enumerate Handles"
+-msgstr ""
++msgstr "Zakończenie numerowania uchwytów"
+
+ #: camlibs/ptp2/ptp.c:5734
-#, fuzzy
- msgid "Canon EOS Full-Press failed"
--msgstr "Canon EOS Capture nie powiodło się"
-+msgstr "Canon EOS Full-Press nie powiodło się"
+ msgid "Get Vendor Extension Maps"
+-msgstr "Rozszerzenie producenta"
++msgstr "Pobranie map rozszerzeń producenta"
+
+ #: camlibs/ptp2/ptp.c:5735
+-#, fuzzy
+ msgid "Get Vendor Device Info"
+-msgstr "Pobranie informacji o urządzeniu"
++msgstr "Pobranie informacji producenta o urządzeniu"
+
+ #: camlibs/ptp2/ptp.c:5736
+ msgid "Get Resized Image Object"
+-msgstr ""
++msgstr "Pobranie obiektu obrazu po zmianie rozmiaru"
+
+ #: camlibs/ptp2/ptp.c:5737
+-#, fuzzy
+ msgid "Get Filesystem Manifest"
+-msgstr "Szybki system plików"
++msgstr "Pobranie manifestu systemu plików"
+
+ #: camlibs/ptp2/ptp.c:5738
+-#, fuzzy
+ msgid "Get Stream Info"
+-msgstr "Pobranie informacji o nośniku"
++msgstr "Pobranie informacji o strumieniu"
+
+ #: camlibs/ptp2/ptp.c:5739
+ msgid "Get Stream"
+-msgstr ""
++msgstr "Pobranie strumienia"
+
+ #: camlibs/ptp2/ptp.c:5743
+ msgid "Get object properties supported"
+@@ -10102,14 +10080,12 @@
+ msgstr "Zakończenie edycji obiektu"
+
+ #: camlibs/ptp2/ptp.c:6012
+-#, fuzzy
+ msgid "Unknown PTP_OC"
+-msgstr "Nieznany %d"
++msgstr "Nieznany PTP_OC"
+
+ #: camlibs/ptp2/ptp.c:6029
+-#, fuzzy
+ msgid "Unknown VendorExtensionID"
+-msgstr "Rozszerzenie producenta"
++msgstr "Nieznane VendorExtensionID"
+
+ #: camlibs/ricoh/g3.c:357
+ msgid "Downloading movie..."
+@@ -10509,7 +10485,6 @@
- #: camlibs/ptp2/library.c:2942 camlibs/ptp2/library.c:3844
+ #: camlibs/sierra/epson-desc.c:240 camlibs/sierra/sierra.c:1689
+ #: camlibs/sierra/sierra.c:1705 camlibs/sierra/sierra.c:1882
-#, fuzzy
- msgid "Canon EOS Full-Release failed"
--msgstr "Canon EOS Capture nie powiodło się"
-+msgstr "Canon EOS Full-Release nie powiodło się"
+ msgid "Portuguese"
+ msgstr "Portugalski"
- #: camlibs/ptp2/library.c:2949
- msgid "Canon EOS Capture failed"
+@@ -11932,30 +11907,3 @@
+ #: libgphoto2/gphoto2-result.c:89
+ msgid "Unknown error"
+ msgstr "Nieznany błąd"
+-
+-#~ msgid "Small Fine JPEG (S1 Fine)"
+-#~ msgstr "Mały dobry JPEG (S1 Fine)"
+-
+-#~ msgid "Small Normal JPEG (S1 Normal)"
+-#~ msgstr "Mały normalny JPEG (S1 Normal)"
+-
+-#~ msgid "RAW + Small Fine JPEG (S1 Fine)"
+-#~ msgstr "RAW + mały dobry JPEG (S1 Fine)"
+-
+-#~ msgid "mRAW + Small Fine JPEG (S1 Fine)"
+-#~ msgstr "mRAW + mały dobry JPEG (S1 Fine)"
+-
+-#~ msgid "sRAW + Small Fine JPEG (S1 Fine)"
+-#~ msgstr "sRAW + mały dobry JPEG (S1 Fine)"
+-
+-#~ msgid "RAW + Small Normal JPEG (S1 Normal)"
+-#~ msgstr "RAW + mały normalny JPEG (S1 Normal)"
+-
+-#~ msgid "mRAW + Small Normal JPEG (S1 Normal)"
+-#~ msgstr "mRAW + mały normalny JPEG (S1 Normal)"
+-
+-#~ msgid "sRAW + Small Normal JPEG (S1 Normal)"
+-#~ msgstr "sRAW + mały normalny JPEG (S1 Normal)"
+-
+-#~ msgid "Unknown (%04x)"
+-#~ msgstr "Nieznany (%04x)"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgphoto2.git/commitdiff/bb37a97bb2cae378bd65ed15d5731cf01b1759a1
More information about the pld-cvs-commit
mailing list