Mailinglist Archive: opensuse-commit (1318 mails)
| < Previous | Next > |
commit fltk
- From: root@xxxxxxx (h_root)
- Date: Mon, 7 Aug 2006 17:58:11 +0200 (CEST)
- Message-id: <20060807155811.8AE4495117@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package fltk
checked in at Mon Aug 7 17:58:11 CEST 2006.
--------
--- fltk/fltk.changes 2006-08-04 13:38:27.000000000 +0200
+++ fltk/fltk.changes 2006-08-07 16:15:58.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Aug 7 16:13:40 CEST 2006 - lmichnovic@xxxxxxx
+
+- fixed prefixes accordingly to new X.org 7.x, detecting prefix in X.org
+
+-------------------------------------------------------------------
Old:
----
fltk-delete-fix.dif
New:
----
fltk-delete-fix.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fltk.spec ++++++
--- /var/tmp/diff_new_pack.MMjOvF/_old 2006-08-07 17:54:44.000000000 +0200
+++ /var/tmp/diff_new_pack.MMjOvF/_new 2006-08-07 17:54:44.000000000 +0200
@@ -12,22 +12,39 @@
Name: fltk
# Build Requires: freeglut-devel gcc-c++ libdrm-devel libjpeg-devel libpng-devel libxml2
-BuildRequires: Mesa-devel gcc-c++ libjpeg-devel libpng-devel
+BuildRequires: Mesa-devel gcc-c++ libjpeg-devel libpng-devel xorg-x11-devel
License: LGPL
Group: Development/Libraries/X11
Autoreqprov: on
Version: 1.1.7
-Release: 1
+Release: 2
Summary: Free C++ GUI Toolkit for the X Window System, OpenGL, and WIN32 (Windows 95,98,NT)
URL: http://www.fltk.org/
Source: %{name}-%{version}-source.tar.bz2
-Patch2: %{name}-delete-fix.dif
+Patch2: %{name}-delete-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package devel
Summary: Include Files and Libraries mandatory for Development.
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Autoreqprov: on
+%if "%(xft-config --prefix)" == "/usr"
+%define _xorg7libs %_lib
+%define _xorg7bin bin
+%define _xorg7_mandir %_mandir
+%define _xorg7pixmaps include
+%define _xorg7libshare share
+#%define _xorg7_config /usr/share/X11/config #use libshare macro
+%define _xorg7_prefix /usr
+%else
+%define _xorg7libs X11R6/%_lib
+%define _xorg7bin X11R6/bin
+%define _xorg7_mandir /usr/X11R6/man
+%define _xorg7pixmaps X11R6/include
+%define _xorg7libshare X11R6/lib/
+#%define _xorg7_config /usr/X11R6/lib/X11/config #use libshare macro
+%define _xorg7_prefix /usr/X11R6
+%endif
%description devel
The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a C++
@@ -60,22 +77,22 @@
%{?suse_update_config:%{suse_update_config}}
./configure CFLAGS="$RPM_OPT_FLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS" \
- --prefix=/usr/X11R6 \
- --bindir=/usr/X11R6/bin \
- --libdir=/usr/X11R6/%{_lib} \
- --includedir=/usr/X11R6/include \
+ --prefix=%{_xorg7_prefix} \
+ --bindir=%{_xorg7_prefix}/bin \
+ --libdir=%{_xorg7_prefix}/%{_lib} \
+ --includedir=%{_xorg7_prefix}/include \
--enable-shared
make glflags="-L/usr/%{_lib}/ -lGL" \
- fltkflags="-L/usr/X11R6/%{_lib}/ -lfltk"
+ fltkflags="-L%{_xorg7_prefix}/%{_lib}/ -lfltk"
%install
-make install libdir=${RPM_BUILD_ROOT}/usr/X11R6/%{_lib}/ \
- includedir=${RPM_BUILD_ROOT}/usr/X11R6/include \
- bindir=${RPM_BUILD_ROOT}/usr/X11R6/bin/ \
+make install libdir=${RPM_BUILD_ROOT}%{_xorg7_prefix}/%{_lib}/ \
+ includedir=${RPM_BUILD_ROOT}%{_xorg7_prefix}/include \
+ bindir=${RPM_BUILD_ROOT}%{_xorg7_prefix}/bin/ \
docdir=${RPM_BUILD_ROOT}/%{_docdir}/fltk \
- mandir=${RPM_BUILD_ROOT}/usr/X11R6/man STRIP=true
-rm -rf ${RPM_BUILD_ROOT}/usr/X11R6/man/cat*
+ mandir=${RPM_BUILD_ROOT}%{_xorg7_mandir} STRIP=true
+rm -rf ${RPM_BUILD_ROOT}%{_xorg7_mandir}/cat*
mv test test.orig
mkdir test
cp test.orig/*.c* test.orig/*.h test.orig/*.fl test.orig/*.xbm test
@@ -97,7 +114,7 @@
%doc %{_docdir}/fltk/CHANGES
%doc %{_docdir}/fltk/COPYING
%doc %{_docdir}/fltk/README
-/usr/X11R6/%{_lib}/*.so.*
+%{_xorg7_prefix}/%{_lib}/*.so.*
%files devel
%defattr(-,root,root)
@@ -108,13 +125,15 @@
%doc %{_docdir}/fltk/*.jpg
%doc %{_docdir}/fltk/*.html
%doc %{_docdir}/fltk/makeinclude
-%doc /usr/X11R6/man/man*/*
-/usr/X11R6/%{_lib}/*.a
-/usr/X11R6/%{_lib}/*.so
-/usr/X11R6/include/*
-/usr/X11R6/bin/*
+%doc %{_xorg7_mandir}/man*/*
+%{_xorg7_prefix}/%{_lib}/*.a
+%{_xorg7_prefix}/%{_lib}/*.so
+%{_xorg7_prefix}/include/*
+%{_xorg7_prefix}/bin/*
%changelog -n fltk
+* Mon Aug 07 2006 - lmichnovic@xxxxxxx
+- fixed prefixes accordingly to new X.org 7.x, detecting prefix in X.org
* Fri Aug 04 2006 - postadal@xxxxxxx
- updated to version 1.1.7
* added some new example programs
++++++ fltk-delete-fix.diff ++++++
--- FL/Fl_Browser_.H
+++ FL/Fl_Browser_.H
@@ -101,8 +101,8 @@
public:
- Fl_Scrollbar scrollbar; // Vertical scrollbar
- Fl_Scrollbar hscrollbar; // Horizontal scrollbar
+ Fl_Scrollbar &scrollbar; // Vertical scrollbar
+ Fl_Scrollbar &hscrollbar; // Horizontal scrollbar
int handle(int);
void resize(int,int,int,int);
--- FL/Fl_Help_View.H
+++ FL/Fl_Help_View.H
@@ -128,8 +128,8 @@
leftline_, // Lefthand position
size_, // Total document length
hsize_; // Maximum document width
- Fl_Scrollbar scrollbar_, // Vertical scrollbar for document
- hscrollbar_; // Horizontal scrollbar
+ Fl_Scrollbar &scrollbar_, // Vertical scrollbar for document
+ &hscrollbar_; // Horizontal scrollbar
Fl_Help_Block *add_block(const char *s, int xx, int yy, int ww, int hh, uchar border = 0);
void add_link(const char *n, int xx, int yy, int ww, int hh);
--- FL/Fl_Scroll.H
+++ FL/Fl_Scroll.H
@@ -46,8 +46,8 @@
public:
- Fl_Scrollbar scrollbar;
- Fl_Scrollbar hscrollbar;
+ Fl_Scrollbar &scrollbar;
+ Fl_Scrollbar &hscrollbar;
void resize(int,int,int,int);
int handle(int);
--- src/Fl_Browser_.cxx
+++ src/Fl_Browser_.cxx
@@ -705,8 +705,8 @@
Fl_Browser_::Fl_Browser_(int X, int Y, int W, int H, const char* l)
: Fl_Group(X, Y, W, H, l),
- scrollbar(0, 0, 0, 0, 0), // they will be resized by draw()
- hscrollbar(0, 0, 0, 0, 0)
+ scrollbar(*new Fl_Scrollbar(0, 0, 0, 0, 0)), // they will be resized by draw()
+ hscrollbar(*new Fl_Scrollbar(0, 0, 0, 0, 0))
{
box(FL_NO_BOX);
align(FL_ALIGN_BOTTOM);
--- src/Fl_Help_View.cxx
+++ src/Fl_Help_View.cxx
@@ -2299,8 +2299,8 @@
int hh, // I - Height in pixels
const char *l)
: Fl_Group(xx, yy, ww, hh, l),
- scrollbar_(xx + ww - 17, yy, 17, hh - 17),
- hscrollbar_(xx, yy + hh - 17, ww - 17, 17)
+ scrollbar_(*new Fl_Scrollbar(xx + ww - 17, yy, 17, hh - 17)),
+ hscrollbar_(*new Fl_Scrollbar(xx, yy + hh - 17, ww - 17, 17))
{
color(FL_BACKGROUND2_COLOR, FL_SELECTION_COLOR);
--- src/Fl_Scroll.cxx
+++ src/Fl_Scroll.cxx
@@ -232,8 +232,8 @@
Fl_Scroll::Fl_Scroll(int X,int Y,int W,int H,const char* L)
: Fl_Group(X,Y,W,H,L),
- scrollbar(X+W-SLIDER_WIDTH,Y,SLIDER_WIDTH,H-SLIDER_WIDTH),
- hscrollbar(X,Y+H-SLIDER_WIDTH,W-SLIDER_WIDTH,SLIDER_WIDTH) {
+ scrollbar(*new Fl_Scrollbar(X+W-SLIDER_WIDTH,Y,SLIDER_WIDTH,H-SLIDER_WIDTH)),
+ hscrollbar(*new Fl_Scrollbar(X,Y+H-SLIDER_WIDTH,W-SLIDER_WIDTH,SLIDER_WIDTH)) {
type(BOTH);
xposition_ = 0;
yposition_ = 0;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
| < Previous | Next > |