parted, port nettoyé

3 files changed, 0 insertions, 379 deletions

diff --git a/extra/parted/Pkgfile b/extra/parted/Pkgfile
index 3222069c0..6d5019dcb 100644
--- a/extra/parted/Pkgfile
+++ b/extra/parted/Pkgfile
@@ -10,11 +10,9 @@ name=parted
 version=2.3
 release=1
 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
-#	parted-1.9.0-btrfs-02.patch	)
 
 build() {
 	cd $name-$version
-#	patch -Np1 -i ../parted-1.9.0-btrfs-02.patch
 	./configure --prefix=/usr \
 	--disable-debug \
 	--without-readline \
diff --git a/extra/parted/parted-1.9.0-btrfs-02.patch b/extra/parted/parted-1.9.0-btrfs-02.patch
deleted file mode 100644
index 4d28767ef..000000000
--- a/extra/parted/parted-1.9.0-btrfs-02.patch
+++ /dev/null
@@ -1,196 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -524,6 +524,7 @@ libparted/Makefile
- libparted/labels/Makefile
- libparted/fs/Makefile
- libparted/fs/amiga/Makefile
-+libparted/fs/btrfs/Makefile
- libparted/fs/ext2/Makefile
- libparted/fs/fat/Makefile
- libparted/fs/hfs/Makefile
-diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
-index 96a5744..365ba7b 100644
---- a/libparted/fs/Makefile.am
-+++ b/libparted/fs/Makefile.am
-@@ -3,7 +3,7 @@
- #
- # This file may be modified and/or distributed without restriction.
- 
--SUBDIRS       = amiga ext2 ufs fat ntfs hfs linux_swap xfs jfs reiserfs # bfs
-+SUBDIRS       = amiga ext2 ufs fat ntfs hfs linux_swap xfs jfs reiserfs btrfs 
-# bfs
- 
- partedincludedir      =        -I$(top_srcdir)/include
- noinst_LTLIBRARIES    =        libfs.la
-diff --git a/libparted/fs/btrfs/Makefile.am b/libparted/fs/btrfs/Makefile.am
-new file mode 100644
-index 0000000..a9428da
---- /dev/null
-+++ b/libparted/fs/btrfs/Makefile.am
-@@ -0,0 +1,8 @@
-+partedincludedir       = -I$(top_srcdir)/include
-+
-+noinst_LTLIBRARIES     = libbtrfs.la
-+libbtrfs_la_SOURCES    = btrfs.c
-+
-+INCLUDES = $(partedincludedir) $(INTLINCS)
-+
-+MAINTAINERCLEANFILES = Makefile.in
-diff --git a/libparted/fs/btrfs/btrfs.c b/libparted/fs/btrfs/btrfs.c
-new file mode 100644
-index 0000000..a79d756
---- /dev/null
-+++ b/libparted/fs/btrfs/btrfs.c
-@@ -0,0 +1,106 @@
-+/*
-+    libparted - a library for manipulating disk partitions
-+    Copyright (C) 2009 Free Software Foundation, Inc.
-+
-+    This program is free software; you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation; either version 3 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+*/
-+
-+#include <config.h>
-+
-+#include <parted/parted.h>
-+#include <parted/endian.h>
-+
-+#if ENABLE_NLS
-+#  include <libintl.h>
-+#  define _(String) dgettext (PACKAGE, String)
-+#else
-+#  define _(String) (String)
-+#endif /* ENABLE_NLS */
-+
-+#include <unistd.h>
-+
-+#define BTRFS_BLOCK_SIZES       ((int[2]){1024, 0})
-+#define BTRFS_SUPER_INFO_SIZE 4096
-+#define BTRFS_SUPER_INFO_OFFSET (64 * 1024)
-+
-+//Should be definitive, as of v0.18
-+#define BTRFS_SIGNATURE        "_BHRfS_M"
-+
-+static PedGeometry*
-+btrfs_probe (PedGeometry* geom)
-+{
-+       char    buf[BTRFS_SUPER_INFO_SIZE];
-+
-+       if (!ped_geometry_read (geom, buf, 
-+                               (BTRFS_SUPER_INFO_OFFSET / 512), 
-+                               (BTRFS_SUPER_INFO_SIZE / 512)))
-+               return 0;
-+
-+       if (strncmp (BTRFS_SIGNATURE, buf + 64, strlen (BTRFS_SIGNATURE)) == 0)
-+               return ped_geometry_new (geom->dev, geom->start, geom->length);
-+       else
-+               return NULL;
-+}
-+
-+#ifndef DISCOVER_ONLY
-+static int
-+btrfs_clobber (PedGeometry* geom)
-+{
-+       char    buf[BTRFS_SUPER_INFO_SIZE];
-+
-+       memset (buf, 0, BTRFS_SUPER_INFO_SIZE);
-+       return ped_geometry_write (geom, buf, 
-+                                   (BTRFS_SUPER_INFO_OFFSET / 512),
-+                                   (BTRFS_SUPER_INFO_SIZE / 512));
-+}
-+#endif /* !DISCOVER_ONLY */
-+
-+static PedFileSystemOps btrfs_ops = {
-+       probe:          btrfs_probe,
-+#ifndef DISCOVER_ONLY
-+       clobber:        btrfs_clobber,
-+#else
-+       clobber:        NULL,
-+#endif 
-+       open:           NULL,
-+       create:         NULL,
-+       close:          NULL,
-+       check:          NULL,
-+       copy:           NULL,
-+       resize:         NULL,
-+       get_create_constraint:  NULL,
-+       get_resize_constraint:  NULL,
-+       get_copy_constraint:    NULL
-+};
-+
-+static PedFileSystemType btrfs_type = {
-+       next:   NULL,
-+       ops:    &btrfs_ops,
-+       name:   "btrfs",
-+       block_sizes: BTRFS_BLOCK_SIZES
-+};
-+
-+void
-+ped_file_system_btrfs_init ()
-+{
-+       ped_file_system_type_register (&btrfs_type);
-+}
-+
-+void
-+ped_file_system_btrfs_done ()
-+{
-+       ped_file_system_type_unregister (&btrfs_type);
-+}
-+
-+
---- parted-1.9.0/libparted/libparted.c.old	2009-09-15 22:28:48.588463837 +0200
-+++ parted-1.9.0/libparted/libparted.c	2009-09-15 22:30:46.736581923 +0200
-@@ -109,6 +109,7 @@
- extern void ped_file_system_hfs_init (void);
- extern void ped_file_system_fat_init (void);
- extern void ped_file_system_ext2_init (void);
-+extern void ped_file_system_btrfs_init (void);
- 
- static void
- init_file_system_types ()
-@@ -123,6 +124,7 @@
- 	ped_file_system_hfs_init ();
- 	ped_file_system_fat_init ();
- 	ped_file_system_ext2_init ();
-+	ped_file_system_btrfs_init ();
- }
- #endif /* ENABLE_FS */
- 
-@@ -188,6 +190,7 @@
- extern void ped_file_system_reiserfs_done (void);
- extern void ped_file_system_ufs_done (void);
- extern void ped_file_system_xfs_done (void);
-+extern void ped_file_system_btrfs_done (void);
- extern void ped_file_system_amiga_done (void);
- 
- static void
-@@ -202,6 +205,7 @@
- 	ped_file_system_reiserfs_done ();
- 	ped_file_system_ufs_done ();
- 	ped_file_system_xfs_done ();
-+	ped_file_system_btrfs_done ();
- 	ped_file_system_amiga_done ();
- }
- #endif /* ENABLE_FS */
---- parted-1.9.0/libparted/fs/Makefile.am.old	2009-09-15 22:41:23.216463981 +0200
-+++ parted-1.9.0/libparted/fs/Makefile.am	2009-09-15 22:41:56.460682352 +0200
-@@ -23,7 +23,8 @@
- 		    linux_swap/liblinuxswap.la	\
- 		    xfs/libxfs.la		\
- 		    jfs/libjfs.la		\
--		    reiserfs/libreiserfs.la
-+		    reiserfs/libreiserfs.la	\
-+		    btrfs/libbtrfs.la
- #		    bfs/libbfs.la
- 
- libfs_la_SOURCES   =
diff --git a/extra/poppler-glib/poppler-0.10-bindings.patch b/extra/poppler-glib/poppler-0.10-bindings.patch
deleted file mode 100644
index e44a262c0..000000000
--- a/extra/poppler-glib/poppler-0.10-bindings.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-diff -ruN poppler-0.10.0/Makefile.am poppler-0.10.0-bindings/Makefile.am
---- poppler-0.10.0/Makefile.am	2008-09-09 23:46:50.000000000 +0200
-+++ poppler-0.10.0-bindings/Makefile.am	2008-11-08 00:03:17.000000000 +0100
-@@ -29,7 +29,7 @@
- utils_subdir = utils
- endif
- 
--SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
-+SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir)
- 
- EXTRA_DIST =					\
- 	README-XPDF				\
-@@ -40,9 +40,6 @@
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA =				\
--	poppler.pc				\
--	$(cairo_pc_file)			\
--	$(splash_pc_file)			\
- 	$(glib_pc_file)				\
- 	$(qt_pc_file)                           \
- 	$(qt4_pc_file)
-diff -ruN poppler-0.10.0/glib/Makefile.am poppler-0.10.0-bindings/glib/Makefile.am
---- poppler-0.10.0/glib/Makefile.am	2008-09-27 17:21:45.000000000 +0200
-+++ poppler-0.10.0-bindings/glib/Makefile.am	2008-11-08 00:03:17.000000000 +0100
-@@ -87,7 +87,7 @@
- 	poppler-private.h
- 
- libpoppler_glib_la_LIBADD =				\
--	$(top_builddir)/poppler/libpoppler.la		\
-+	-lpoppler					\
- 	$(POPPLER_GLIB_LIBS)				\
- 	$(GDK_LIBS)					\
- 	$(FREETYPE_LIBS)				\
-@@ -103,7 +103,7 @@
-        test-poppler-glib.cc
- 
- test_poppler_glib_LDADD =			\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	libpoppler-glib.la			\
- 	$(POPPLER_GLIB_LIBS)			\
- 	$(GDK_LIBS)				\
-diff -ruN poppler-0.10.0/glib/demo/Makefile.am poppler-0.10.0-bindings/glib/demo/Makefile.am
---- poppler-0.10.0/glib/demo/Makefile.am	2008-08-24 18:19:55.000000000 +0200
-+++ poppler-0.10.0-bindings/glib/demo/Makefile.am	2008-11-08 00:03:17.000000000 +0100
-@@ -36,5 +36,5 @@
- 
- LDADD =						\
- 	$(top_builddir)/glib/libpoppler-glib.la	\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler	\
- 	$(GTK_TEST_LIBS)
-diff -ruN poppler-0.10.0/glib/reference/Makefile.am poppler-0.10.0-bindings/glib/reference/Makefile.am
---- poppler-0.10.0/glib/reference/Makefile.am	2008-07-24 22:45:05.000000000 +0200
-+++ poppler-0.10.0-bindings/glib/reference/Makefile.am	2008-11-08 00:03:17.000000000 +0100
-@@ -73,7 +73,7 @@
- 	$(GDK_CFLAGS)					\
- 	$(FREETYPE_CFLAGS)
- 
--GTKDOC_LIBS=$(top_builddir)/poppler/libpoppler.la	\
-+GTKDOC_LIBS=-lpoppler	\
- 	$(top_builddir)/glib/libpoppler-glib.la		\
- 	$(POPPLER_GLIB_LIBS)				\
- 	$(FREETYPE_LIBS)				\
-diff -ruN poppler-0.10.0/qt/Makefile.am poppler-0.10.0-bindings/qt/Makefile.am
---- poppler-0.10.0/qt/Makefile.am	2008-07-24 22:45:05.000000000 +0200
-+++ poppler-0.10.0-bindings/qt/Makefile.am	2008-11-08 00:03:17.000000000 +0100
-@@ -24,7 +24,7 @@
- 	poppler-private.h
- 
- libpoppler_qt_la_LIBADD = 			\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	$(POPPLER_QT_LIBS)			\
- 	$(FREETYPE_LIBS)			\
- 	$(FONTCONFIG_LIBS)
-@@ -41,7 +41,7 @@
-        test-poppler-qt.cpp
- 
- test_poppler_qt_LDADD =				\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	libpoppler-qt.la			\
- 	$(POPPLER_QT_LIBS)			\
- 	$(FREETYPE_LIBS)
-diff -ruN poppler-0.10.0/qt4/demos/Makefile.am poppler-0.10.0-bindings/qt4/demos/Makefile.am
---- poppler-0.10.0/qt4/demos/Makefile.am	2008-07-24 22:45:06.000000000 +0200
-+++ poppler-0.10.0-bindings/qt4/demos/Makefile.am	2008-11-08 00:05:09.000000000 +0100
-@@ -7,7 +7,7 @@
- 	$(POPPLER_QT4_CFLAGS)
- 
- LDADDS =					\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler	\
- 	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
- 	$(FONTCONFIG_LIBS)				\
- 	$(POPPLER_QT4_LIBS)
-diff -ruN poppler-0.10.0/qt4/src/Makefile.am poppler-0.10.0-bindings/qt4/src/Makefile.am
---- poppler-0.10.0/qt4/src/Makefile.am	2008-09-10 00:02:49.000000000 +0200
-+++ poppler-0.10.0-bindings/qt4/src/Makefile.am	2008-11-08 00:03:17.000000000 +0100
-@@ -52,7 +52,7 @@
- 	poppler-private.h
- 
- libpoppler_qt4_la_LIBADD = 			\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	$(FONTCONFIG_LIBS)				\
- 	$(POPPLER_QT4_LIBS)
- 
-diff -ruN poppler-0.10.0/qt4/tests/Makefile.am poppler-0.10.0-bindings/qt4/tests/Makefile.am
---- poppler-0.10.0/qt4/tests/Makefile.am	2008-09-05 18:41:33.000000000 +0200
-+++ poppler-0.10.0-bindings/qt4/tests/Makefile.am	2008-11-08 00:03:17.000000000 +0100
-@@ -7,7 +7,7 @@
- 	$(POPPLER_QT4_CFLAGS)
- 
- LDADDS =					\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
- 	$(FONTCONFIG_LIBS)				\
- 	$(POPPLER_QT4_LIBS)
-diff -ruN poppler-0.10.0/test/Makefile.am poppler-0.10.0-bindings/test/Makefile.am
---- poppler-0.10.0/test/Makefile.am	2008-10-06 19:35:46.000000000 +0200
-+++ poppler-0.10.0-bindings/test/Makefile.am	2008-11-08 00:05:42.000000000 +0100
-@@ -51,14 +51,14 @@
-        gtk-splash-test.cc
- 
- gtk_splash_test_LDADD =				\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler	\
- 	$(GTK_TEST_LIBS)
- 
- gtk_cairo_test_SOURCES =			\
-        gtk-cairo-test.cc
- 
- gtk_cairo_test_LDADD =					\
--	$(top_builddir)/poppler/libpoppler.la		\
-+	-lpoppler		\
- 	$(top_builddir)/glib/libpoppler-glib.la		\
- 	$(CAIRO_LIBS)					\
- 	$(GTK_TEST_LIBS)				\
-@@ -69,7 +69,7 @@
- 
- pdf_inspector_LDADD =					\
- 	$(top_builddir)/poppler/libpoppler-cairo.la	\
--	$(top_builddir)/poppler/libpoppler.la		\
-+	-lpoppler		\
- 	$(CAIRO_LIBS)					\
- 	$(FREETYPE_LIBS)				\
- 	$(GTK_TEST_LIBS)				\
-@@ -80,7 +80,7 @@
-        perf-test-preview-dummy.cc
- 
- perf_test_LDADD =				\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler	\
- 	$(FREETYPE_LIBS)					\
- 	$(X_EXTRA_LIBS)
- 
-@@ -88,7 +88,7 @@
- 	pdf-fullrewrite.cc
- 
- pdf_fullrewrite_LDADD = \
--	$(top_builddir)/poppler/libpoppler.la
-+	-lpoppler
- 
- EXTRA_DIST =					\
- 	pdf-operators.c				\
-diff -ruN poppler-0.10.0/utils/Makefile.am poppler-0.10.0-bindings/utils/Makefile.am
---- poppler-0.10.0/utils/Makefile.am	2008-09-09 20:55:24.000000000 +0200
-+++ poppler-0.10.0-bindings/utils/Makefile.am	2008-11-08 00:03:17.000000000 +0100
-@@ -29,7 +29,7 @@
- 	$(ABIWORD_CFLAGS)
- 
- LDADD =						\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler	\
- 	$(UTILS_LIBS)				\
- 	$(FONTCONFIG_LIBS)
-