[packages/rox] Rel 3

Sat Aug 16 16:14:40 CEST 2025

commit 7728a41e2cf25371945cea5b662b25f129eb656c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Aug 16 16:14:33 2025 +0200

    Rel 3

 build.patch       | 44 ++++++++++++++++++++++++++++++++++++++++++++
 rox-help.patch    | 12 ++++++------
 rox-linking.patch |  2 +-
 rox.spec          |  7 +++++--
 4 files changed, 56 insertions(+), 9 deletions(-)
---

diff --git a/rox.spec b/rox.spec
index 0a80c11..b9524d9 100644
--- a/rox.spec
+++ b/rox.spec
@@ -2,7 +2,7 @@ Summary:	File manager
 Summary(pl.UTF-8):	Zarządca plików
 Name:		rox
 Version:	2.11
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/rox/rox-filer-%{version}.tar.bz2
@@ -10,6 +10,7 @@ Source0:	http://dl.sourceforge.net/rox/rox-filer-%{version}.tar.bz2
 Source1:	%{name}.desktop
 Patch0:		%{name}-help.patch
 Patch1:		%{name}-linking.patch
+Patch2:		build.patch
 URL:		http://rox.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	gtk+2-devel >= 2:2.4.0
@@ -41,6 +42,7 @@ uniksowych.
 %setup -q -n rox-filer-%{version}
 %patch -P0 -p1
 %patch -P1 -p1
+%patch -P2 -p1
 
 %build
 cd ROX-Filer/src
@@ -50,7 +52,8 @@ cd -
 
 mkdir ROX-Filer/build
 cd ROX-Filer/build
-../src/%configure
+%define configuredir ../src/
+%configure
 
 %{__make}
 
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..9ff653a
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,44 @@
+--- rox-filer-2.11/ROX-Filer/src/log.c~	2011-10-09 16:31:59.000000000 +0200
++++ rox-filer-2.11/ROX-Filer/src/log.c	2025-08-16 15:17:33.393697092 +0200
+@@ -140,7 +140,7 @@ void log_show_window()
+ 	GtkCellRenderer *renderer;
+ 	gchar *ids[] = {"Log viewer", NULL};
+ 
+-	builder = get_gtk_builder(&ids);
++	builder = get_gtk_builder(ids);
+ 
+ 	tv = GTK_TREE_VIEW(gtk_builder_get_object(builder, "log_list"));
+ 	gtk_tree_view_set_model(tv, GTK_TREE_MODEL(log));
+@@ -163,7 +163,7 @@ void log_show_window()
+ 							   NULL);
+ 	gtk_tree_view_append_column(tv, column);
+ 
+-	dialog = gtk_builder_get_object(builder, "Log viewer");
++	dialog = GTK_WIDGET(gtk_builder_get_object(builder, "Log viewer"));
+ 	g_signal_connect(G_OBJECT(dialog),
+ 			 "response", (GCallback) log_dialog_response, NULL);
+ 
+--- rox-filer-2.11/ROX-Filer/src/session.h~	2011-10-09 16:31:59.000000000 +0200
++++ rox-filer-2.11/ROX-Filer/src/session.h	2025-08-16 15:19:31.441084681 +0200
+@@ -10,7 +10,7 @@
+ #include <gtk/gtk.h>
+ #include <X11/SM/SMlib.h>
+ 
+-gboolean session_auto_respawn;
++extern gboolean session_auto_respawn;
+ 
+ void session_init(const gchar *client_id);
+ 
+--- rox-filer-2.11/ROX-Filer/src/Makefile.in~	2011-10-09 16:31:59.000000000 +0200
++++ rox-filer-2.11/ROX-Filer/src/Makefile.in	2025-08-16 16:13:15.917414457 +0200
+@@ -47,10 +47,6 @@ OBJECTS = abox.o action.o appinfo.o appm
+ ${PROG}: ${OBJECTS}
+ 	${CC} -o "${PROG}" ${OBJECTS} ${LDFLAGS}
+ 	mv "${PROG}" "${PLATFORM_DIR}"
+-	-(cd "${PLATFORM_DIR}" && \
+-	 objcopy --only-keep-debug ROX-Filer ROX-Filer.dbg && \
+-	 strip ROX-Filer && \
+-	 objcopy --add-gnu-debuglink=ROX-Filer.dbg ROX-Filer)
+ 
+ clean:
+ 	rm -f *.o Makefile.bak
diff --git a/rox-help.patch b/rox-help.patch
index 876303f..733d69c 100644
--- a/rox-help.patch
+++ b/rox-help.patch
@@ -1,7 +1,7 @@
-diff -ruN rox-2.1.3./ROX-Filer/src/main.c rox-2.1.3/ROX-Filer/src/main.c
---- rox-2.1.3./ROX-Filer/src/main.c	2004-08-03 14:33:03.000000000 +0200
-+++ rox-2.1.3/ROX-Filer/src/main.c	2004-08-03 14:41:03.908216808 +0200
-@@ -101,10 +101,10 @@
+diff -urNp -x '*.orig' rox-filer-2.11.org/ROX-Filer/src/main.c rox-filer-2.11/ROX-Filer/src/main.c
+--- rox-filer-2.11.org/ROX-Filer/src/main.c	2011-10-09 16:31:59.000000000 +0200
++++ rox-filer-2.11/ROX-Filer/src/main.c	2025-08-16 15:12:06.801704396 +0200
+@@ -103,10 +103,10 @@ GtkTooltips *tooltips = NULL;
  		"see the file named COPYING.\n")
  
  #ifdef HAVE_GETOPT_LONG
@@ -14,7 +14,7 @@ diff -ruN rox-2.1.3./ROX-Filer/src/main.c rox-2.1.3/ROX-Filer/src/main.c
  #  define SHORT_ONLY_WARNING	\
  		_("NOTE: Your system does not support long options - \n" \
  		"you must use the short versions instead.\n\n")
-@@ -112,7 +112,7 @@
+@@ -114,7 +114,7 @@ GtkTooltips *tooltips = NULL;
  
  #define BUGS_TO "<rox-devel at lists.sourceforge.net>"
  
@@ -22,4 +22,4 @@ diff -ruN rox-2.1.3./ROX-Filer/src/main.c rox-2.1.3/ROX-Filer/src/main.c
 +#define HELP N_("Usage: rox [OPTION]... [FILE]...\n"	\
         "Open each directory or file listed, or the current working\n"	\
         "directory if no arguments are given.\n\n"			\
-        "  -b, --bottom=PANEL	open PAN as a bottom-edge panel\n"	\
+        "  -b, --border=PANEL	open PANEL as a border panel\n"	\
diff --git a/rox-linking.patch b/rox-linking.patch
index f4b3fe5..b9cf745 100644
--- a/rox-linking.patch
+++ b/rox-linking.patch
@@ -5,7 +5,7 @@
    AC_MSG_ERROR([X development libraries not found])
  fi
 -LIBS="$LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-+LIBS="$LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -ldl"
++LIBS="$LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -ldl -lm"
  CFLAGS="$CFLAGS $X_CFLAGS"
  
  dnl Does file(1) support '-b' ?
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rox.git/commitdiff/7728a41e2cf25371945cea5b662b25f129eb656c

