[packages/links2] - updated pl-update patch - BR: libevent-devel libgomp-devel librsvg-devel - disable BR SDL-devel (S

qboosh qboosh at pld-linux.org
Thu Jul 16 21:37:49 CEST 2015


commit b4575d908a3c635f688d2d0458a49f1ce7ac69cc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jul 16 21:39:01 2015 +0200

    - updated pl-update patch
    - BR: libevent-devel libgomp-devel librsvg-devel
    - disable BR SDL-devel (SDL support disabled in configure)

 links2-pl-update.patch | 74 ++++++++++++++++++++++++++++++++++++++++++++++----
 links2.spec            | 15 ++++++----
 2 files changed, 77 insertions(+), 12 deletions(-)
---
diff --git a/links2.spec b/links2.spec
index 0fbcb7b..d03541c 100644
--- a/links2.spec
+++ b/links2.spec
@@ -1,10 +1,10 @@
 #
 # Conditional build:
-%bcond_without	graphics	# build without graphics support
-%bcond_without	fb		# build without Linux Framebuffer graphics driver
-%bcond_without	sdl		# build without SDL graphics driver
-%bcond_with	svga		# build without svgalib graphics driver
-%bcond_without	x		# build without X Window System graphics driver
+%bcond_without	graphics	# graphics support
+%bcond_without	fb		# Linux Framebuffer graphics driver
+%bcond_with	sdl		# SDL graphics driver [disabled in sources]
+%bcond_with	svga		# svgalib graphics driver
+%bcond_without	x		# X Window System graphics driver
 #
 Summary:	Lynx-like WWW browser
 Summary(es.UTF-8):	El links es un browser para modo texto, similar a lynx
@@ -39,6 +39,7 @@ BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
 BuildRequires:	gpm-devel
+BuildRequires:	libevent-devel
 BuildRequires:	ncurses-devel >= 5.1
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pkgconfig
@@ -46,8 +47,10 @@ BuildRequires:	zlib-devel
 %if %{with graphics}
 %{?with_fb:BuildRequires:	DirectFB-devel >= 0.9.17}
 %{?with_sdl:BuildRequires:	SDL-devel >= 1.2.0}
+BuildRequires:	libgomp-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
+BuildRequires:	librsvg-devel >= 2.0.0
 BuildRequires:	libtiff-devel
 %{?with_svga:BuildRequires:	svgalib-devel}
 %{?with_x:BuildRequires:	xorg-lib-libX11-devel}
@@ -114,7 +117,7 @@ трохи відмінний від нього:
 %patch5 -p1
 %patch6 -p1
 %patch9 -p1
-#%%patch10 -p1
+%patch10 -p1
 %patch17 -p1
 %patch18 -p1
 
diff --git a/links2-pl-update.patch b/links2-pl-update.patch
index 2483d50..2499d7b 100644
--- a/links2-pl-update.patch
+++ b/links2-pl-update.patch
@@ -1,6 +1,66 @@
---- links-2.8/intl/polish.lng.orig	2013-07-22 00:58:22.000000000 +0200
-+++ links-2.8/intl/polish.lng	2013-10-12 22:00:44.326127883 +0200
-@@ -239,8 +239,8 @@
+--- links-2.10/intl/polish.lng.orig	2015-05-28 19:24:55.000000000 +0200
++++ links-2.10/intl/polish.lng	2015-07-16 21:29:26.033756135 +0200
+@@ -28,9 +28,9 @@
+ T_MEMORY, "Pami��",
+ T_FILE_SIZE, "rozmiar pliku",
+ T_DEBUGGING_LEVEL, "Poziom diagnostyki",
+-T_EVENT_HANDLER, NULL,
+-T_SELECT_SYSCALL, NULL,
+-T_dISABLED, NULL,
++T_EVENT_HANDLER, "Obs�uga zdarze�",
++T_SELECT_SYSCALL, "Wywo�anie systemowe select",
++T_dISABLED, "wy��czone",
+ T_IPV6, "IPv6",
+ T_NOT_ENABLED_IN_SYSTEM, "Nie w��czone w systemie",
+ T_LOCAL_NETWORK_ONLY, "Tylko sie� lokalna",
+@@ -41,11 +41,11 @@
+ T_XTERM_FOR_OS2, "Xterm dla OS/2",
+ T_GRAPHICS_MODE, "Tryb graficzny",
+ T_IMAGE_LIBRARIES, "Biblioteki obraz�w",
+-T_OPENMP, NULL,
+-T_DISABLED, NULL,
+-T_THREAD, NULL,
+-T_THREADS, NULL,
+-T_THREADS5, NULL,
++T_OPENMP, "OpenMP",
++T_DISABLED, "Wy��czone",
++T_THREAD, "w�tek",
++T_THREADS, "w�tki",
++T_THREADS5, "w�tk�w",
+ T_KEYS, "Klawiszologia",
+ T_KEYS_DESC, "ESC       poka� menu\n^C, q     wyj�cie\n^P, ^N    przewi� g�ra,d�\n[, ]      przewi� lewo,prawo\ng�ra, d� zaznacz link\n->        wybierz link\n<-        powr�t\ng         przejd� do URL-a\nG         przejd� do URL-a bazuj�cego na aktualnym\n/         szukaj\nn         znajd� nast�pny\nd         pobierz\n*         prze��cz wy�wietlanie obrazk�w\n^W        dope�nij URL lub szukany �a�cuch\n^B, ^X, ^V skopiuj, wytnij, wklej do/ze schowka\nAlt-1 .. Alt-9 prze��cz ekran wirtualny (svgalib lub framebuffer)",
+ T_KEYS_BRAILLE_DESC, "a, t      kursor do linii stanu lub tytu�u\n{, }      kursor do pocz�tku/ko�ca linii\n^T, ^Y    nast�pny lub poprzedni odno�nik",
+@@ -91,13 +91,13 @@
+ T_COLOR, "Kolor",
+ T_BRAILLE_TERMINAL, "Terminal Braille'a",
+ T_TERMINAL_OPTIONS, "Opcje terminala",
+-T_SCREEN_MARGINS, NULL,
+-T_LEFT_MARGIN, NULL,
+-T_RIGHT_MARGIN, NULL,
+-T_TOP_MARGIN, NULL,
+-T_BOTTOM_MARGIN, NULL,
+-T_MARGINS_TOO_LARGE, NULL,
+-T_THE_ENTERED_VALUES_ARE_TOO_LARGE_FOR_THE_CURRENT_SCREEN, NULL,
++T_SCREEN_MARGINS, "Marginesy ekranu",
++T_LEFT_MARGIN, "Lewy margines",
++T_RIGHT_MARGIN, "Prawy margines",
++T_TOP_MARGIN, "G�rny margines",
++T_BOTTOM_MARGIN, "Dolny margines",
++T_MARGINS_TOO_LARGE, "Marginesy zbyt du�e",
++T_THE_ENTERED_VALUES_ARE_TOO_LARGE_FOR_THE_CURRENT_SCREEN, "Wprowadzone warto�ci s� zbyt du�e dla obecnego ekranu",
+ T_NETWORK_OPTIONS, "Ustawienia sieci",
+ T_IPV6_OPTIONS, "Opcje IPv6",
+ T_IPV6_DEFAULT, "Domy�lne preferencje systemu",
+@@ -132,7 +132,7 @@
+ T_HTML_OPTIONS, "Ustawienia HTML",
+ T_DISPLAY_TABLES, "Wy�wietlaj tabele",
+ T_DISPLAY_FRAMES, "Wy�wietlaj ramki",
+-T_BREAK_LONG_LINES, NULL,
++T_BREAK_LONG_LINES, "�am d�ugie linie",
+ T_DISPLAY_IMAGES, "Wy�wietlaj obrazy",
+ T_DISPLAY_IMAGE_FILENAMES, "Wy�wietlaj nazwy plik�w obraz�w",
+ T_DISPLAY_LINKS_TO_IMAGES, "Pokazuj linki do obrazk�w",
+@@ -255,8 +255,8 @@
  T_SOCKS_UNKNOWN_ERROR, "Nieznany b��d Socks",
  T_NO_SMB_CLIENT, "Brak zainstalowanego klienta smb (obs�ugiwane s� smbclient i smbc)",
  T_BLOCKED_URL, "Ten URL jest na li�cie zablokowanych",
@@ -11,16 +71,18 @@
  T_NO_PROXY, "Brak proxy dla tego po��czenia, a po��czenia bez proxy s� wy��czone",
  T_UNKNOWN_ERROR, "Nieznany b��d",
  T_RECEIVED, "Pobrano",
-@@ -421,7 +421,7 @@
+@@ -437,8 +437,8 @@
  T_RETRY_ON_INTERNAL_ERRORS, "Ponawiaj pr�by przy wewn�trznych b��dach serwera (50x)",
  T_HEADER_OPTIONS, "Opcje nag��wka",
  T_HTTP_HEADER_OPTIONS, "Opcje nag��wka HTTP",
+-T_FAKE_FIREFOX, NULL,
 -T_DO_NOT_TRACK, NULL,
++T_FAKE_FIREFOX, "Udawanie Firefoksa (poprawia prywatno��)",
 +T_DO_NOT_TRACK, "Wysy�anie ��dania \"do not track\"",
  T_REFERER_NONE, "Bez nag��wka Referer",
  T_REFERER_SAME_URL, "Wysy�aj ��dany URL jako Referer",
  T_REFERER_FAKE, "Sta�y nag��wek Referer",
-@@ -435,7 +435,7 @@
+@@ -452,7 +452,7 @@
  T_USE_EPRT_EPSV, "U�ywaj polece� EPRT/EPSV po IPv4",
  T_USE_FAST_FTP, "U�ywaj szybkiego FTP",
  T_SET_TYPE_OF_SERVICE, "Ustaw typ us�ugi IP (ToS)",
@@ -29,7 +91,7 @@
  T_MANUAL, "Podr�cznik u�ytkownika",
  T_HOMEPAGE, "Strona domowa",
  T_CALIBRATION, "Kalibracja",
-@@ -523,7 +523,7 @@
+@@ -540,7 +540,7 @@
  T_SCROLL_BAR_AREA_COLOR, "Kolor obszaru paska przewijania",
  T_SCROLL_BAR_FRAME_COLOR, "Kolor ramki paska przewijania",
  T_BOOKMARKS_FILE, "Plik zak�adek",
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/links2.git/commitdiff/b4575d908a3c635f688d2d0458a49f1ce7ac69cc



More information about the pld-cvs-commit mailing list