rpms/azureus/FC-5 azureus-nativetabs.patch, NONE, 1.1 azureus-themed.patch, 1.2, 1.3 azureus.spec, 1.23, 1.24
Anthony Green (green)
fedora-extras-commits at redhat.com
Mon Apr 24 20:25:10 UTC 2006
Author: green
Update of /cvs/extras/rpms/azureus/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17792
Modified Files:
azureus-themed.patch azureus.spec
Added Files:
azureus-nativetabs.patch
Log Message:
Release -5. GUI tweak and gcj bug fix.
azureus-nativetabs.patch:
--- NEW FILE azureus-nativetabs.patch ---
--- azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java.orig 2006-04-17 16:00:58.000000000 +0200
+++ azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java 2006-04-17 16:01:21.000000000 +0200
@@ -78,8 +78,8 @@
cLook.setLayout(layout);
BooleanParameter bpCustomTab = new BooleanParameter(cLook, "useCustomTab",
- true, MSG_PREFIX + "useCustomTabs");
- Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", true,
+ false, MSG_PREFIX + "useCustomTabs");
+ Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", false,
MSG_PREFIX + "useFancyTabs").getControl();
Control[] controls = { cFancyTab };
--- azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java.orig 2006-04-17 17:25:18.000000000 +0200
+++ azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java 2006-04-17 17:26:19.000000000 +0200
@@ -154,7 +154,7 @@
def.put("User Mode", new Long(0));
- def.put("useCustomTab",TRUE);
+ def.put("useCustomTab",FALSE);
def.put("GUI Refresh",new Long(1000));
def.put("Graphics Update",new Long(4));
def.put("ReOrder Delay",new Long(0));
@@ -167,7 +167,7 @@
def.put("Use default data dir", FALSE);
def.put("Default save path", "" );
- def.put("GUI_SWT_bFancyTab", TRUE);
+ def.put("GUI_SWT_bFancyTab", FALSE);
def.put("GUI_SWT_bAlternateTablePainting", FALSE);
def.put("update.start",TRUE);
def.put("update.periodic",TRUE);
azureus-themed.patch:
Index: azureus-themed.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-themed.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- azureus-themed.patch 9 Feb 2006 08:45:07 -0000 1.2
+++ azureus-themed.patch 24 Apr 2006 20:25:10 -0000 1.3
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/ui/swt/ImageRepository.java~ 2006-01-25 20:28:17.000000000 -0800
-+++ org/gudy/azureus2/ui/swt/ImageRepository.java 2006-01-25 20:28:27.000000000 -0800
-@@ -16,6 +16,8 @@
+--- azureus/org/gudy/azureus2/ui/swt/ImageRepository.java.orig 2006-04-22 17:48:33.000000000 +0200
++++ azureus/org/gudy/azureus2/ui/swt/ImageRepository.java 2006-04-22 17:50:33.000000000 +0200
+@@ -32,6 +32,8 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.InputStream;
@@ -9,7 +9,7 @@
import java.util.*;
/**
-@@ -43,6 +45,25 @@
+@@ -59,6 +61,25 @@
loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash");
}
@@ -22,9 +22,9 @@
+ if (iconTheme == null)
+ iconTheme = org.gnu.gtk.IconTheme.getDefault();
+
-+ return iconTheme.lookupIcon (name, 24,
-+ org.gnu.gtk.IconLookupFlags.NO_SVG)
-+ .getFilename();
++ org.gnu.gtk.IconInfo icon = iconTheme.lookupIcon (name, 24,
++ org.gnu.gtk.IconLookupFlags.NO_SVG);
++ return icon != null ? icon.getFilename() : def;
+ }
+ catch (Exception ex)
+ {
@@ -35,7 +35,7 @@
public static void loadImages(Display display) {
loadImage(display, "org/gudy/azureus2/ui/icons/a32.png", "azureus32");
loadImage(display, "org/gudy/azureus2/ui/icons/a64.png", "azureus64");
-@@ -87,20 +108,44 @@
+@@ -103,20 +124,44 @@
//ToolBar Icons
loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open");
@@ -92,7 +92,7 @@
//Status icons
loadImage(display, "org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok");
-@@ -139,6 +184,16 @@
+@@ -157,6 +202,16 @@
Image im = getImage(name,false);
if(null == im) {
InputStream is = loader.getResourceAsStream(res);
@@ -109,3 +109,10 @@
if(null != is) {
try {
if(alpha == 255) {
+@@ -453,4 +508,4 @@
+
+ return key;
+ }
+-}
+\ Kein Zeilenumbruch am Dateiende.
++}
Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- azureus.spec 6 Apr 2006 16:55:28 -0000 1.23
+++ azureus.spec 24 Apr 2006 20:25:10 -0000 1.24
@@ -1,6 +1,6 @@
Name: azureus
Version: 2.4.0.3
-Release: 0.20060328cvs_4%{?dist}
+Release: 0.20060328cvs_5%{?dist}
Summary: A BitTorrent Client
Group: Applications/Internet
@@ -46,6 +46,7 @@
Patch23: azureus-no-update-manager-PluginInstallerImpl-2.patch
Patch24: azureus-MessageSlideShell-swt-3.1.patch
Patch25: azureus-no-update-manager-MainStatusBar.patch
+Patch26: azureus-nativetabs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,7 +77,7 @@
%patch4 -p0
%patch5 -p0
%patch6 -p0
-%patch7 -p0
+%patch7 -p1
%patch8 -p0
%patch9 -p0
%patch10 -p0
@@ -95,6 +96,7 @@
%patch23 -p0
%patch24 -p0
%patch25 -p0
+%patch26 -p1
cp %{SOURCE4} License.txt
cp %{SOURCE5} ChangeLog.txt
@@ -204,6 +206,10 @@
%{_libdir}/gcj/*
%changelog
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_5
+- Two patches from Stephan Michels: nativetabs (for native GTK+ tabs), and
+an updated azureus-themed.patch to work around GCC PR 27271.
+
* Thu Apr 06 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_4
- Yet another correction to LD_LIBRARY_PATH. Bugzilla #186152.
More information about the fedora-extras-commits
mailing list