mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-02 07:57:43 +00:00
Merge branch 'for-2010.11/remove-deprecated-packages' of git://git.busybox.net/~tpetazzoni/git/buildroot
This commit is contained in:
commit
5ba97d900a
2
CHANGES
2
CHANGES
@ -10,6 +10,8 @@
|
|||||||
Updated/fixed packages: berkeleydb, busybox, dropbear,
|
Updated/fixed packages: berkeleydb, busybox, dropbear,
|
||||||
iptables, kismet, openvpn, qt, usbutils
|
iptables, kismet, openvpn, qt, usbutils
|
||||||
|
|
||||||
|
Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
|
||||||
|
|
||||||
2010.08: Released August 31th, 2010:
|
2010.08: Released August 31th, 2010:
|
||||||
|
|
||||||
Fixes all over the tree.
|
Fixes all over the tree.
|
||||||
|
@ -568,7 +568,6 @@ BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
|
|||||||
# BR2_PACKAGE_LIBDAEMON is not set
|
# BR2_PACKAGE_LIBDAEMON is not set
|
||||||
# BR2_PACKAGE_LIBELF is not set
|
# BR2_PACKAGE_LIBELF is not set
|
||||||
# BR2_PACKAGE_LIBEVENT is not set
|
# BR2_PACKAGE_LIBEVENT is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
# BR2_PACKAGE_LIBGLIB2 is not set
|
# BR2_PACKAGE_LIBGLIB2 is not set
|
||||||
# BR2_PACKAGE_LIBOIL is not set
|
# BR2_PACKAGE_LIBOIL is not set
|
||||||
|
|
||||||
|
@ -615,7 +615,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
# BR2_PACKAGE_LIBGLIB2 is not set
|
# BR2_PACKAGE_LIBGLIB2 is not set
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -623,7 +623,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
|
|||||||
BR2_PACKAGE_MTD_SUMTOOL=y
|
BR2_PACKAGE_MTD_SUMTOOL=y
|
||||||
# BR2_PACKAGE_NTFS-3G is not set
|
# BR2_PACKAGE_NTFS-3G is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
BR2_PACKAGE_SETSERIAL=y
|
BR2_PACKAGE_SETSERIAL=y
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
||||||
@ -722,7 +721,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
BR2_PACKAGE_LIBGLIB2=y
|
BR2_PACKAGE_LIBGLIB2=y
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -539,7 +539,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
# BR2_PACKAGE_LIBGLIB2 is not set
|
# BR2_PACKAGE_LIBGLIB2 is not set
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -552,7 +552,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
|
|||||||
BR2_PACKAGE_MTD_SUMTOOL=y
|
BR2_PACKAGE_MTD_SUMTOOL=y
|
||||||
# BR2_PACKAGE_NTFS-3G is not set
|
# BR2_PACKAGE_NTFS-3G is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
BR2_PACKAGE_SETSERIAL=y
|
BR2_PACKAGE_SETSERIAL=y
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
||||||
@ -651,7 +650,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
BR2_PACKAGE_LIBGLIB2=y
|
BR2_PACKAGE_LIBGLIB2=y
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -637,7 +637,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
|
|||||||
BR2_PACKAGE_MTD_SUMTOOL=y
|
BR2_PACKAGE_MTD_SUMTOOL=y
|
||||||
# BR2_PACKAGE_NTFS-3G is not set
|
# BR2_PACKAGE_NTFS-3G is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
BR2_PACKAGE_SETSERIAL=y
|
BR2_PACKAGE_SETSERIAL=y
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
||||||
@ -736,7 +735,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
BR2_PACKAGE_LIBGLIB2=y
|
BR2_PACKAGE_LIBGLIB2=y
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -539,7 +539,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
# BR2_PACKAGE_LIBGLIB2 is not set
|
# BR2_PACKAGE_LIBGLIB2 is not set
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -560,7 +560,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
|
|||||||
BR2_PACKAGE_MTD_SUMTOOL=y
|
BR2_PACKAGE_MTD_SUMTOOL=y
|
||||||
# BR2_PACKAGE_NTFS-3G is not set
|
# BR2_PACKAGE_NTFS-3G is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
BR2_PACKAGE_SETSERIAL=y
|
BR2_PACKAGE_SETSERIAL=y
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
||||||
@ -659,7 +658,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
BR2_PACKAGE_LIBGLIB2=y
|
BR2_PACKAGE_LIBGLIB2=y
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -423,7 +423,6 @@ BR2_BLOCKDEV_SUPPORT=y
|
|||||||
# BR2_PACKAGE_MKDOSFS is not set
|
# BR2_PACKAGE_MKDOSFS is not set
|
||||||
# BR2_PACKAGE_MTD is not set
|
# BR2_PACKAGE_MTD is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
# BR2_PACKAGE_RAIDTOOLS is not set
|
# BR2_PACKAGE_RAIDTOOLS is not set
|
||||||
# BR2_PACKAGE_SETSERIAL is not set
|
# BR2_PACKAGE_SETSERIAL is not set
|
||||||
# BR2_PACKAGE_SFDISK is not set
|
# BR2_PACKAGE_SFDISK is not set
|
||||||
@ -502,7 +501,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_ATK is not set
|
# BR2_PACKAGE_ATK is not set
|
||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
# BR2_PACKAGE_LIBGLIB2 is not set
|
# BR2_PACKAGE_LIBGLIB2 is not set
|
||||||
BR2_PACKAGE_FONTCONFIG=y
|
BR2_PACKAGE_FONTCONFIG=y
|
||||||
BR2_PACKAGE_FREETYPE=y
|
BR2_PACKAGE_FREETYPE=y
|
||||||
|
@ -580,7 +580,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
|
|||||||
BR2_PACKAGE_MTD_SUMTOOL=y
|
BR2_PACKAGE_MTD_SUMTOOL=y
|
||||||
# BR2_PACKAGE_NTFS-3G is not set
|
# BR2_PACKAGE_NTFS-3G is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
BR2_PACKAGE_SETSERIAL=y
|
BR2_PACKAGE_SETSERIAL=y
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
||||||
@ -738,7 +737,6 @@ BR2_PACKAGE_PANGO=y
|
|||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
BR2_PACKAGE_LIBERATION=y
|
BR2_PACKAGE_LIBERATION=y
|
||||||
# BR2_PACKAGE_LIBGLADE is not set
|
# BR2_PACKAGE_LIBGLADE is not set
|
||||||
BR2_PACKAGE_LIBGLIB12=y
|
|
||||||
BR2_PACKAGE_LIBGLIB2=y
|
BR2_PACKAGE_LIBGLIB2=y
|
||||||
BR2_PACKAGE_LIBGTK2=y
|
BR2_PACKAGE_LIBGTK2=y
|
||||||
BR2_PACKAGE_LIBGTK2_ENGINES=y
|
BR2_PACKAGE_LIBGTK2_ENGINES=y
|
||||||
|
@ -542,7 +542,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
# BR2_PACKAGE_LIBGLIB2 is not set
|
# BR2_PACKAGE_LIBGLIB2 is not set
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -539,7 +539,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
|
|||||||
BR2_PACKAGE_MTD_SUMTOOL=y
|
BR2_PACKAGE_MTD_SUMTOOL=y
|
||||||
# BR2_PACKAGE_NTFS-3G is not set
|
# BR2_PACKAGE_NTFS-3G is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
BR2_PACKAGE_SETSERIAL=y
|
BR2_PACKAGE_SETSERIAL=y
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
||||||
@ -697,7 +696,6 @@ BR2_PACKAGE_PANGO=y
|
|||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
BR2_PACKAGE_LIBERATION=y
|
BR2_PACKAGE_LIBERATION=y
|
||||||
# BR2_PACKAGE_LIBGLADE is not set
|
# BR2_PACKAGE_LIBGLADE is not set
|
||||||
BR2_PACKAGE_LIBGLIB12=y
|
|
||||||
BR2_PACKAGE_LIBGLIB2=y
|
BR2_PACKAGE_LIBGLIB2=y
|
||||||
BR2_PACKAGE_LIBGTK2=y
|
BR2_PACKAGE_LIBGTK2=y
|
||||||
BR2_PACKAGE_LIBGTK2_ENGINES=y
|
BR2_PACKAGE_LIBGTK2_ENGINES=y
|
||||||
|
@ -577,7 +577,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
|
|||||||
BR2_PACKAGE_MTD_SUMTOOL=y
|
BR2_PACKAGE_MTD_SUMTOOL=y
|
||||||
# BR2_PACKAGE_NTFS-3G is not set
|
# BR2_PACKAGE_NTFS-3G is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
BR2_PACKAGE_SETSERIAL=y
|
BR2_PACKAGE_SETSERIAL=y
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
||||||
@ -735,7 +734,6 @@ BR2_PACKAGE_PANGO=y
|
|||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
BR2_PACKAGE_LIBERATION=y
|
BR2_PACKAGE_LIBERATION=y
|
||||||
# BR2_PACKAGE_LIBGLADE is not set
|
# BR2_PACKAGE_LIBGLADE is not set
|
||||||
BR2_PACKAGE_LIBGLIB12=y
|
|
||||||
BR2_PACKAGE_LIBGLIB2=y
|
BR2_PACKAGE_LIBGLIB2=y
|
||||||
BR2_PACKAGE_LIBGTK2=y
|
BR2_PACKAGE_LIBGTK2=y
|
||||||
BR2_PACKAGE_LIBGTK2_ENGINES=y
|
BR2_PACKAGE_LIBGTK2_ENGINES=y
|
||||||
|
@ -541,7 +541,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
# BR2_PACKAGE_LIBGLIB2 is not set
|
# BR2_PACKAGE_LIBGLIB2 is not set
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -502,7 +502,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
|
|||||||
BR2_PACKAGE_MTD_SUMTOOL=y
|
BR2_PACKAGE_MTD_SUMTOOL=y
|
||||||
# BR2_PACKAGE_NTFS-3G is not set
|
# BR2_PACKAGE_NTFS-3G is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
BR2_PACKAGE_SETSERIAL=y
|
BR2_PACKAGE_SETSERIAL=y
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
||||||
@ -660,7 +659,6 @@ BR2_PACKAGE_PANGO=y
|
|||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
BR2_PACKAGE_LIBERATION=y
|
BR2_PACKAGE_LIBERATION=y
|
||||||
# BR2_PACKAGE_LIBGLADE is not set
|
# BR2_PACKAGE_LIBGLADE is not set
|
||||||
BR2_PACKAGE_LIBGLIB12=y
|
|
||||||
BR2_PACKAGE_LIBGLIB2=y
|
BR2_PACKAGE_LIBGLIB2=y
|
||||||
BR2_PACKAGE_LIBGTK2=y
|
BR2_PACKAGE_LIBGTK2=y
|
||||||
BR2_PACKAGE_LIBGTK2_ENGINES=y
|
BR2_PACKAGE_LIBGTK2_ENGINES=y
|
||||||
|
@ -573,7 +573,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
|
|||||||
BR2_PACKAGE_MTD_SUMTOOL=y
|
BR2_PACKAGE_MTD_SUMTOOL=y
|
||||||
# BR2_PACKAGE_NTFS-3G is not set
|
# BR2_PACKAGE_NTFS-3G is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
BR2_PACKAGE_SETSERIAL=y
|
BR2_PACKAGE_SETSERIAL=y
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
||||||
@ -670,7 +669,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
# BR2_PACKAGE_LIBGLIB2 is not set
|
# BR2_PACKAGE_LIBGLIB2 is not set
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -539,7 +539,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
# BR2_PACKAGE_LIBGLIB2 is not set
|
# BR2_PACKAGE_LIBGLIB2 is not set
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -560,7 +560,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
|
|||||||
BR2_PACKAGE_MTD_SUMTOOL=y
|
BR2_PACKAGE_MTD_SUMTOOL=y
|
||||||
# BR2_PACKAGE_NTFS-3G is not set
|
# BR2_PACKAGE_NTFS-3G is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
BR2_PACKAGE_SETSERIAL=y
|
BR2_PACKAGE_SETSERIAL=y
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
BR2_PACKAGE_UDEV_VOLUME_ID=y
|
||||||
@ -659,7 +658,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
BR2_PACKAGE_LIBGLIB2=y
|
BR2_PACKAGE_LIBGLIB2=y
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -486,7 +486,6 @@ BR2_PACKAGE_MTD_NANDWRITE=y
|
|||||||
BR2_PACKAGE_MTD_SUMTOOL=y
|
BR2_PACKAGE_MTD_SUMTOOL=y
|
||||||
# BR2_PACKAGE_NTFS_3G is not set
|
# BR2_PACKAGE_NTFS_3G is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
# BR2_PACKAGE_SETSERIAL is not set
|
# BR2_PACKAGE_SETSERIAL is not set
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
# BR2_PACKAGE_USBMOUNT is not set
|
# BR2_PACKAGE_USBMOUNT is not set
|
||||||
@ -587,7 +586,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
# BR2_PACKAGE_LIBGLIB2 is not set
|
# BR2_PACKAGE_LIBGLIB2 is not set
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -428,7 +428,6 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
|
|||||||
# BR2_PACKAGE_NTFS_3G is not set
|
# BR2_PACKAGE_NTFS_3G is not set
|
||||||
# BR2_PACKAGE_NTFSPROGS is not set
|
# BR2_PACKAGE_NTFSPROGS is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
# BR2_PACKAGE_SETSERIAL is not set
|
# BR2_PACKAGE_SETSERIAL is not set
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
# BR2_PACKAGE_SQUASHFS is not set
|
# BR2_PACKAGE_SQUASHFS is not set
|
||||||
@ -545,7 +544,6 @@ BR2_PACKAGE_ZLIB=y
|
|||||||
BR2_PACKAGE_LIBDAEMON=y
|
BR2_PACKAGE_LIBDAEMON=y
|
||||||
# BR2_PACKAGE_LIBELF is not set
|
# BR2_PACKAGE_LIBELF is not set
|
||||||
# BR2_PACKAGE_LIBEVENT is not set
|
# BR2_PACKAGE_LIBEVENT is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
BR2_PACKAGE_LIBGLIB2=y
|
BR2_PACKAGE_LIBGLIB2=y
|
||||||
# BR2_PACKAGE_LIBOIL is not set
|
# BR2_PACKAGE_LIBOIL is not set
|
||||||
# BR2_PACKAGE_STARTUP_NOTIFICATION is not set
|
# BR2_PACKAGE_STARTUP_NOTIFICATION is not set
|
||||||
|
@ -537,7 +537,6 @@ BR2_PACKAGE_MTD_MTD_DEBUG=y
|
|||||||
# BR2_PACKAGE_MTD_SUMTOOL is not set
|
# BR2_PACKAGE_MTD_SUMTOOL is not set
|
||||||
# BR2_PACKAGE_NTFS-3G is not set
|
# BR2_PACKAGE_NTFS-3G is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
# BR2_PACKAGE_SETSERIAL is not set
|
# BR2_PACKAGE_SETSERIAL is not set
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
# BR2_PACKAGE_USBMOUNT is not set
|
# BR2_PACKAGE_USBMOUNT is not set
|
||||||
@ -632,7 +631,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
BR2_PACKAGE_LIBGLIB2=y
|
BR2_PACKAGE_LIBGLIB2=y
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -544,7 +544,6 @@ BR2_PACKAGE_MTD_MTD_DEBUG=y
|
|||||||
# ntfs-3g requires a toolchain with LARGEFILE and WCHAR support
|
# ntfs-3g requires a toolchain with LARGEFILE and WCHAR support
|
||||||
#
|
#
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
# BR2_PACKAGE_SETSERIAL is not set
|
# BR2_PACKAGE_SETSERIAL is not set
|
||||||
# BR2_PACKAGE_SFDISK is not set
|
# BR2_PACKAGE_SFDISK is not set
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
@ -731,7 +730,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
BR2_PACKAGE_LIBGLIB2=y
|
BR2_PACKAGE_LIBGLIB2=y
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -484,7 +484,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
|
|||||||
BR2_PACKAGE_MTD_SUMTOOL=y
|
BR2_PACKAGE_MTD_SUMTOOL=y
|
||||||
# BR2_PACKAGE_NTFS_3G is not set
|
# BR2_PACKAGE_NTFS_3G is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
# BR2_PACKAGE_SETSERIAL is not set
|
# BR2_PACKAGE_SETSERIAL is not set
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
# BR2_PACKAGE_USBMOUNT is not set
|
# BR2_PACKAGE_USBMOUNT is not set
|
||||||
@ -575,7 +574,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
# BR2_PACKAGE_LIBGLIB2 is not set
|
# BR2_PACKAGE_LIBGLIB2 is not set
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -484,7 +484,6 @@ BR2_PACKAGE_MTD_NFTLDUMP=y
|
|||||||
BR2_PACKAGE_MTD_SUMTOOL=y
|
BR2_PACKAGE_MTD_SUMTOOL=y
|
||||||
# BR2_PACKAGE_NTFS_3G is not set
|
# BR2_PACKAGE_NTFS_3G is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
# BR2_PACKAGE_SETSERIAL is not set
|
# BR2_PACKAGE_SETSERIAL is not set
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
# BR2_PACKAGE_USBMOUNT is not set
|
# BR2_PACKAGE_USBMOUNT is not set
|
||||||
@ -575,7 +574,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
# BR2_PACKAGE_LIBGLIB2 is not set
|
# BR2_PACKAGE_LIBGLIB2 is not set
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -471,7 +471,6 @@ BR2_PACKAGE_TCPDUMP=y
|
|||||||
# BR2_PACKAGE_MTD is not set
|
# BR2_PACKAGE_MTD is not set
|
||||||
# BR2_PACKAGE_NTFS-3G is not set
|
# BR2_PACKAGE_NTFS-3G is not set
|
||||||
BR2_PACKAGE_PCIUTILS=y
|
BR2_PACKAGE_PCIUTILS=y
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
# BR2_PACKAGE_SETSERIAL is not set
|
# BR2_PACKAGE_SETSERIAL is not set
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
# BR2_PACKAGE_USBMOUNT is not set
|
# BR2_PACKAGE_USBMOUNT is not set
|
||||||
@ -573,7 +572,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
# BR2_PACKAGE_LIBGLIB2 is not set
|
# BR2_PACKAGE_LIBGLIB2 is not set
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -453,7 +453,6 @@ BR2_PACKAGE_TCPDUMP=y
|
|||||||
# BR2_PACKAGE_MTD is not set
|
# BR2_PACKAGE_MTD is not set
|
||||||
# BR2_PACKAGE_NTFS-3G is not set
|
# BR2_PACKAGE_NTFS-3G is not set
|
||||||
BR2_PACKAGE_PCIUTILS=y
|
BR2_PACKAGE_PCIUTILS=y
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
# BR2_PACKAGE_SETSERIAL is not set
|
# BR2_PACKAGE_SETSERIAL is not set
|
||||||
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
# BR2_PACKAGE_SMARTMONTOOLS is not set
|
||||||
# BR2_PACKAGE_USBMOUNT is not set
|
# BR2_PACKAGE_USBMOUNT is not set
|
||||||
@ -552,7 +551,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
# BR2_PACKAGE_LIBGLIB2 is not set
|
# BR2_PACKAGE_LIBGLIB2 is not set
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -473,7 +473,6 @@ BR2_BLOCKDEV_SUPPORT=y
|
|||||||
# BR2_PACKAGE_MTD is not set
|
# BR2_PACKAGE_MTD is not set
|
||||||
# BR2_PACKAGE_NTFS-3G is not set
|
# BR2_PACKAGE_NTFS-3G is not set
|
||||||
# BR2_PACKAGE_PCIUTILS is not set
|
# BR2_PACKAGE_PCIUTILS is not set
|
||||||
# BR2_PACKAGE_PCMCIA is not set
|
|
||||||
# BR2_PACKAGE_RAIDTOOLS is not set
|
# BR2_PACKAGE_RAIDTOOLS is not set
|
||||||
# BR2_PACKAGE_SETSERIAL is not set
|
# BR2_PACKAGE_SETSERIAL is not set
|
||||||
# BR2_PACKAGE_SFDISK is not set
|
# BR2_PACKAGE_SFDISK is not set
|
||||||
@ -558,7 +557,6 @@ BR2_PACKAGE_XSERVER_none=y
|
|||||||
#
|
#
|
||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
# BR2_PACKAGE_LIBGLIB2 is not set
|
# BR2_PACKAGE_LIBGLIB2 is not set
|
||||||
# BR2_PACKAGE_LIBSEXY is not set
|
# BR2_PACKAGE_LIBSEXY is not set
|
||||||
|
|
||||||
|
@ -574,7 +574,6 @@ BR2_PACKAGE_QT_OPENSSL=y
|
|||||||
# BR2_PACKAGE_PANGO is not set
|
# BR2_PACKAGE_PANGO is not set
|
||||||
# BR2_PACKAGE_LIBDRM is not set
|
# BR2_PACKAGE_LIBDRM is not set
|
||||||
# BR2_PACKAGE_LIBERATION is not set
|
# BR2_PACKAGE_LIBERATION is not set
|
||||||
# BR2_PACKAGE_LIBGLIB12 is not set
|
|
||||||
BR2_PACKAGE_LIBGLIB2=y
|
BR2_PACKAGE_LIBGLIB2=y
|
||||||
# BR2_PACKAGE_OPENMOTIF is not set
|
# BR2_PACKAGE_OPENMOTIF is not set
|
||||||
# BR2_PACKAGE_FONTCONFIG is not set
|
# BR2_PACKAGE_FONTCONFIG is not set
|
||||||
|
@ -107,9 +107,6 @@ source "package/sdl_gfx/Config.in"
|
|||||||
|
|
||||||
comment "other GUIs"
|
comment "other GUIs"
|
||||||
source "package/qt/Config.in"
|
source "package/qt/Config.in"
|
||||||
|
|
||||||
#source "package/microwin/Config.in"
|
|
||||||
|
|
||||||
source "package/x11r7/Config.in"
|
source "package/x11r7/Config.in"
|
||||||
|
|
||||||
comment "X libraries and helper libraries"
|
comment "X libraries and helper libraries"
|
||||||
@ -123,7 +120,6 @@ source "package/blackbox/Config.in"
|
|||||||
|
|
||||||
comment "X applications"
|
comment "X applications"
|
||||||
source "package/alsamixergui/Config.in"
|
source "package/alsamixergui/Config.in"
|
||||||
source "package/dillo/Config.in"
|
|
||||||
source "package/docker/Config.in"
|
source "package/docker/Config.in"
|
||||||
source "package/gqview/Config.in"
|
source "package/gqview/Config.in"
|
||||||
source "package/gmpc/Config.in"
|
source "package/gmpc/Config.in"
|
||||||
@ -180,7 +176,6 @@ source "package/mtd/Config.in"
|
|||||||
source "package/ntfs-3g/Config.in"
|
source "package/ntfs-3g/Config.in"
|
||||||
source "package/ntfsprogs/Config.in"
|
source "package/ntfsprogs/Config.in"
|
||||||
source "package/pciutils/Config.in"
|
source "package/pciutils/Config.in"
|
||||||
source "package/pcmcia/Config.in"
|
|
||||||
source "package/setserial/Config.in"
|
source "package/setserial/Config.in"
|
||||||
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||||
# busybox has fdisk
|
# busybox has fdisk
|
||||||
@ -268,7 +263,6 @@ source "package/libart/Config.in"
|
|||||||
source "package/libdrm/Config.in"
|
source "package/libdrm/Config.in"
|
||||||
source "package/libgail/Config.in"
|
source "package/libgail/Config.in"
|
||||||
source "package/libglade/Config.in"
|
source "package/libglade/Config.in"
|
||||||
source "package/libgtk12/Config.in"
|
|
||||||
source "package/libgtk2/Config.in"
|
source "package/libgtk2/Config.in"
|
||||||
source "package/libpng/Config.in"
|
source "package/libpng/Config.in"
|
||||||
source "package/libsvgtiny/Config.in"
|
source "package/libsvgtiny/Config.in"
|
||||||
@ -318,7 +312,6 @@ source "package/libdaemon/Config.in"
|
|||||||
source "package/libelf/Config.in"
|
source "package/libelf/Config.in"
|
||||||
source "package/libevent/Config.in"
|
source "package/libevent/Config.in"
|
||||||
source "package/libfloat/Config.in"
|
source "package/libfloat/Config.in"
|
||||||
source "package/libglib12/Config.in"
|
|
||||||
source "package/libglib2/Config.in"
|
source "package/libglib2/Config.in"
|
||||||
source "package/liboil/Config.in"
|
source "package/liboil/Config.in"
|
||||||
source "package/startup-notification/Config.in"
|
source "package/startup-notification/Config.in"
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
config BR2_PACKAGE_DILLO
|
|
||||||
bool "dillo"
|
|
||||||
depends on BR2_DEPRECATED
|
|
||||||
select BR2_PACKAGE_JPEG
|
|
||||||
select BR2_PACKAGE_LIBGLIB12
|
|
||||||
select BR2_PACKAGE_LIBGTK12
|
|
||||||
select BR2_PACKAGE_ZLIB
|
|
||||||
select BR2_PACKAGE_LIBPNG
|
|
||||||
depends on BR2_PACKAGE_XORG7
|
|
||||||
help
|
|
||||||
Dillo is a small GTK+ based web browser written in C.
|
|
||||||
|
|
||||||
http://www.dillo.org/
|
|
@ -1,58 +0,0 @@
|
|||||||
#############################################################
|
|
||||||
#
|
|
||||||
# dillo
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
|
|
||||||
DILLO_VERSION=0.8.6
|
|
||||||
DILLO_SOURCE=dillo-$(DILLO_VERSION).tar.bz2
|
|
||||||
DILLO_SITE=http://www.dillo.org/download/
|
|
||||||
DILLO_DIR=$(BUILD_DIR)/dillo-$(DILLO_VERSION)
|
|
||||||
DILLO_CAT:=$(BZCAT)
|
|
||||||
|
|
||||||
$(DL_DIR)/$(DILLO_SOURCE):
|
|
||||||
$(call DOWNLOAD,$(DILLO_SITE),$(DILLO_SOURCE))
|
|
||||||
|
|
||||||
$(DILLO_DIR)/.unpacked: $(DL_DIR)/$(DILLO_SOURCE)
|
|
||||||
$(DILLO_CAT) $(DL_DIR)/$(DILLO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
|
||||||
touch $(DILLO_DIR)/.unpacked
|
|
||||||
|
|
||||||
$(DILLO_DIR)/.configured: $(DILLO_DIR)/.unpacked
|
|
||||||
(cd $(DILLO_DIR); rm -rf config.cache; \
|
|
||||||
$(TARGET_CONFIGURE_OPTS) \
|
|
||||||
$(TARGET_CONFIGURE_ARGS) \
|
|
||||||
./configure $(QUIET) \
|
|
||||||
--target=$(GNU_TARGET_NAME) \
|
|
||||||
--host=$(GNU_TARGET_NAME) \
|
|
||||||
--build=$(GNU_HOST_NAME) \
|
|
||||||
--prefix=/usr \
|
|
||||||
--sysconfdir=/etc \
|
|
||||||
--program-transform-name='' \
|
|
||||||
--disable-dlgui \
|
|
||||||
)
|
|
||||||
touch $(DILLO_DIR)/.configured
|
|
||||||
|
|
||||||
$(DILLO_DIR)/src/dillo: $(DILLO_DIR)/.configured
|
|
||||||
$(MAKE) CC="$(TARGET_CC)" -C $(DILLO_DIR)
|
|
||||||
|
|
||||||
$(DILLO_DIR)/.installed: $(DILLO_DIR)/src/dillo
|
|
||||||
$(MAKE) -C $(DILLO_DIR) DESTDIR=$(TARGET_DIR) install
|
|
||||||
touch $(DILLO_DIR)/.installed
|
|
||||||
|
|
||||||
dillo: xserver_xorg-server libglib12 libgtk12 jpeg libpng $(DILLO_DIR)/.installed
|
|
||||||
|
|
||||||
dillo-source: $(DL_DIR)/$(DILLO_SOURCE)
|
|
||||||
|
|
||||||
dillo-clean:
|
|
||||||
-$(MAKE) -C $(DILLO_DIR) clean
|
|
||||||
|
|
||||||
dillo-dirclean:
|
|
||||||
rm -rf $(DILLO_DIR)
|
|
||||||
#############################################################
|
|
||||||
#
|
|
||||||
# Toplevel Makefile options
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
ifeq ($(BR2_PACKAGE_DILLO),y)
|
|
||||||
TARGETS+=dillo
|
|
||||||
endif
|
|
@ -1,7 +0,0 @@
|
|||||||
config BR2_PACKAGE_LIBGLIB12
|
|
||||||
bool "libglib12"
|
|
||||||
depends on BR2_DEPRECATED
|
|
||||||
help
|
|
||||||
Low-level core library that forms the basis of GTK+ and GNOME.
|
|
||||||
|
|
||||||
http://www.gtk.org/
|
|
@ -1,41 +0,0 @@
|
|||||||
--- glib-1.2.10/gstrfuncs.c.orig 2001-02-27 07:00:22.000000000 +0100
|
|
||||||
+++ glib-1.2.10/gstrfuncs.c 2004-03-01 13:19:49.531603760 +0100
|
|
||||||
@@ -867,7 +867,7 @@
|
|
||||||
/* beware of positional parameters
|
|
||||||
*/
|
|
||||||
case '$':
|
|
||||||
- g_warning (G_GNUC_PRETTY_FUNCTION
|
|
||||||
+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
|
|
||||||
"(): unable to handle positional parameters (%%n$)");
|
|
||||||
len += 1024; /* try adding some safety padding */
|
|
||||||
break;
|
|
||||||
@@ -1034,7 +1034,7 @@
|
|
||||||
/* n . dddddddddddddddddddddddd E +- eeee */
|
|
||||||
conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4;
|
|
||||||
if (spec.mod_extra_long)
|
|
||||||
- g_warning (G_GNUC_PRETTY_FUNCTION
|
|
||||||
+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
|
|
||||||
"(): unable to handle long double, collecting double only");
|
|
||||||
#ifdef HAVE_LONG_DOUBLE
|
|
||||||
#error need to implement special handling for long double
|
|
||||||
@@ -1077,7 +1077,7 @@
|
|
||||||
conv_done = TRUE;
|
|
||||||
if (spec.mod_long)
|
|
||||||
{
|
|
||||||
- g_warning (G_GNUC_PRETTY_FUNCTION
|
|
||||||
+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
|
|
||||||
"(): unable to handle wide char strings");
|
|
||||||
len += 1024; /* try adding some safety padding */
|
|
||||||
}
|
|
||||||
@@ -1108,9 +1108,8 @@
|
|
||||||
conv_len += format - spec_start;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
- g_warning (G_GNUC_PRETTY_FUNCTION
|
|
||||||
- "(): unable to handle `%c' while parsing format",
|
|
||||||
- c);
|
|
||||||
+ g_warning ("%s(): unable to handle `%c' while parsing format",
|
|
||||||
+ G_GNUC_PRETTY_FUNCTION, c);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
conv_done |= conv_len > 0;
|
|
@ -1,88 +0,0 @@
|
|||||||
--- glib/ltconfig
|
|
||||||
+++ glib/ltconfig
|
|
||||||
@@ -450,6 +450,7 @@
|
|
||||||
# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
|
|
||||||
case "$host_os" in
|
|
||||||
linux-gnu*) ;;
|
|
||||||
+linux-uclibc*) ;;
|
|
||||||
linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
|
|
||||||
esac
|
|
||||||
|
|
||||||
@@ -1981,6 +1982,28 @@
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
+linux-uclibc*)
|
|
||||||
+ version_type=linux
|
|
||||||
+ need_lib_prefix=no
|
|
||||||
+ need_version=no
|
|
||||||
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
|
|
||||||
+ soname_spec='${libname}${release}.so$major'
|
|
||||||
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
|
|
||||||
+ shlibpath_var=LD_LIBRARY_PATH
|
|
||||||
+ shlibpath_overrides_runpath=no
|
|
||||||
+ # deplibs_check_method=pass_all
|
|
||||||
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
|
|
||||||
+ file_magic_cmd=/usr/bin/file
|
|
||||||
+ file_magic_test_file=`echo /lib/libuClibc-*.so`
|
|
||||||
+ # This implies no fast_install, which is unacceptable.
|
|
||||||
+ # Some rework will be needed to allow for fast_install
|
|
||||||
+ # before this can be enabled.
|
|
||||||
+ # Note: copied from linux-gnu, and may not be appropriate.
|
|
||||||
+ hardcode_into_libs=yes
|
|
||||||
+ # Assume using the uClibc dynamic linker.
|
|
||||||
+ dynamic_linker="uClibc ld.so"
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
netbsd*)
|
|
||||||
version_type=sunos
|
|
||||||
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
|
|
||||||
--- g/configure
|
|
||||||
+++ g/configure
|
|
||||||
@@ -966,6 +966,7 @@
|
|
||||||
host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
|
||||||
host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|
||||||
echo "$ac_t""$host" 1>&6
|
|
||||||
+host_alias=$host
|
|
||||||
|
|
||||||
echo $ac_n "checking build system type""... $ac_c" 1>&6
|
|
||||||
echo "configure:972: checking build system type" >&5
|
|
||||||
diff -urN glib-1.2.10-0rig/ltconfig glib-1.2.10/ltconfig
|
|
||||||
--- glib-1.2.10-0rig/ltconfig 2009-01-17 02:56:10.000000000 +0100
|
|
||||||
+++ glib-1.2.10/ltconfig 2009-01-17 02:55:40.000000000 +0100
|
|
||||||
@@ -448,6 +448,9 @@
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
|
|
||||||
+echo $ac_n "host_os... $host_os" 1>&5
|
|
||||||
+echo $ac_n "host_os... $host_os" 1>&6
|
|
||||||
+
|
|
||||||
case "$host_os" in
|
|
||||||
linux-gnu*) ;;
|
|
||||||
linux-uclibc*) ;;
|
|
||||||
@@ -761,6 +764,7 @@
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
can_build_shared=no
|
|
||||||
+ echo "$progname:764: No OS found: host_os = $host_os" >&5
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
@@ -1791,6 +1795,8 @@
|
|
||||||
# If you have `file' or equivalent on your system and you're not sure
|
|
||||||
# whether `pass_all' will *always* work, you probably want this one.
|
|
||||||
echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
|
|
||||||
+echo $ac_n "host_os... $host_os" 1>&5
|
|
||||||
+echo $ac_n "host_os... $host_os" 1>&6
|
|
||||||
case "$host_os" in
|
|
||||||
aix3*)
|
|
||||||
version_type=linux
|
|
||||||
@@ -1982,7 +1988,7 @@
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
-linux-uclibc*)
|
|
||||||
+*-linux | linux-uclibc*)
|
|
||||||
version_type=linux
|
|
||||||
need_lib_prefix=no
|
|
||||||
need_version=no
|
|
@ -1,97 +0,0 @@
|
|||||||
#############################################################
|
|
||||||
#
|
|
||||||
# libglib1.2
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
LIBGLIB12_VERSION:=1.2.10
|
|
||||||
LIBGLIB12_SOURCE:=glib-$(LIBGLIB12_VERSION).tar.gz
|
|
||||||
LIBGLIB12_SITE:=http://ftp.gtk.org/pub/gtk/v1.2
|
|
||||||
LIBGLIB12_CAT:=$(ZCAT)
|
|
||||||
LIBGLIB12_DIR:=$(BUILD_DIR)/glib-$(LIBGLIB12_VERSION)
|
|
||||||
LIBGLIB12_BINARY:=libglib.a
|
|
||||||
|
|
||||||
$(DL_DIR)/$(LIBGLIB12_SOURCE):
|
|
||||||
$(call DOWNLOAD,$(LIBGLIB12_SITE),$(LIBGLIB12_SOURCE))
|
|
||||||
|
|
||||||
$(LIBGLIB12_DIR)/.unpacked: $(DL_DIR)/$(LIBGLIB12_SOURCE)
|
|
||||||
$(LIBGLIB12_CAT) $(DL_DIR)/$(LIBGLIB12_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
|
||||||
toolchain/patch-kernel.sh $(LIBGLIB12_DIR) package/libglib12/ \*.patch*
|
|
||||||
$(CONFIG_UPDATE) $(LIBGLIB12_DIR)
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
$(LIBGLIB12_DIR)/.configured: $(LIBGLIB12_DIR)/.unpacked
|
|
||||||
(cd $(LIBGLIB12_DIR); rm -rf config.cache; \
|
|
||||||
$(TARGET_CONFIGURE_OPTS) \
|
|
||||||
$(TARGET_CONFIGURE_ARGS) \
|
|
||||||
./configure $(QUIET) \
|
|
||||||
--target=$(GNU_TARGET_NAME) \
|
|
||||||
--host=$(GNU_TARGET_NAME) \
|
|
||||||
--build=$(GNU_HOST_NAME) \
|
|
||||||
--prefix=/usr \
|
|
||||||
--exec-prefix=/usr \
|
|
||||||
--bindir=/usr/bin \
|
|
||||||
--sbindir=/usr/sbin \
|
|
||||||
--libdir=/lib \
|
|
||||||
--libexecdir=/usr/lib \
|
|
||||||
--sysconfdir=/etc \
|
|
||||||
--datadir=/usr/share \
|
|
||||||
--localstatedir=/var \
|
|
||||||
--includedir=/usr/include \
|
|
||||||
--mandir=/usr/man \
|
|
||||||
--infodir=/usr/info \
|
|
||||||
--enable-shared \
|
|
||||||
$(DISABLE_NLS) \
|
|
||||||
)
|
|
||||||
touch $@
|
|
||||||
|
|
||||||
$(LIBGLIB12_DIR)/.libs/$(LIBGLIB12_BINARY): $(LIBGLIB12_DIR)/.configured
|
|
||||||
$(MAKE) CC="$(TARGET_CC)" -C $(LIBGLIB12_DIR)
|
|
||||||
|
|
||||||
$(STAGING_DIR)/lib/$(LIBGLIB12_BINARY): $(LIBGLIB12_DIR)/.libs/$(LIBGLIB12_BINARY)
|
|
||||||
$(MAKE) prefix=$(STAGING_DIR) \
|
|
||||||
exec_prefix=$(STAGING_DIR) \
|
|
||||||
bindir=$(STAGING_DIR)/bin \
|
|
||||||
sbindir=$(STAGING_DIR)/sbin \
|
|
||||||
libexecdir=$(STAGING_DIR)/bin \
|
|
||||||
datadir=$(STAGING_DIR)/share \
|
|
||||||
sysconfdir=$(STAGING_DIR)/etc \
|
|
||||||
sharedstatedir=$(STAGING_DIR)/com \
|
|
||||||
localstatedir=$(STAGING_DIR)/var \
|
|
||||||
libdir=$(STAGING_DIR)/lib \
|
|
||||||
includedir=$(STAGING_DIR)/usr/include \
|
|
||||||
oldincludedir=$(STAGING_DIR)/include \
|
|
||||||
infodir=$(STAGING_DIR)/info \
|
|
||||||
mandir=$(STAGING_DIR)/man \
|
|
||||||
-C $(LIBGLIB12_DIR) install
|
|
||||||
|
|
||||||
$(TARGET_DIR)/lib/libglib-1.2.so.0.0.10: $(STAGING_DIR)/lib/$(LIBGLIB12_BINARY)
|
|
||||||
cp -dpf $(STAGING_DIR)/lib/libglib.so $(TARGET_DIR)/lib/
|
|
||||||
cp -dpf $(STAGING_DIR)/lib/libglib-1.2.so.0 $(TARGET_DIR)/lib/
|
|
||||||
cp -dpf $(STAGING_DIR)/lib/libglib-1.2.so.0.0.10 $(TARGET_DIR)/lib/
|
|
||||||
cp -dpf $(STAGING_DIR)/lib/libgmodule.so $(TARGET_DIR)/lib/
|
|
||||||
cp -dpf $(STAGING_DIR)/lib/libgmodule-1.2.so.0 $(TARGET_DIR)/lib/
|
|
||||||
cp -dpf $(STAGING_DIR)/lib/libgmodule-1.2.so.0.0.10 $(TARGET_DIR)/lib/
|
|
||||||
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libglib-1.2.so.0.0.10
|
|
||||||
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgmodule-1.2.so.0.0.10
|
|
||||||
|
|
||||||
libglib12-source: $(DL_DIR)/$(LIBGLIB12_SOURCE)
|
|
||||||
|
|
||||||
libglib12-unpacked: $(LIBGLIB12_DIR)/.unpacked
|
|
||||||
|
|
||||||
libglib12: $(TARGET_DIR)/lib/libglib-1.2.so.0.0.10
|
|
||||||
|
|
||||||
libglib12-clean:
|
|
||||||
rm -f $(TARGET_DIR)/lib/$(LIBGLIB12_BINARY)
|
|
||||||
-$(MAKE) -C $(LIBGLIB12_DIR) clean
|
|
||||||
|
|
||||||
libglib12-dirclean:
|
|
||||||
rm -rf $(LIBGLIB12_DIR)
|
|
||||||
|
|
||||||
#############################################################
|
|
||||||
#
|
|
||||||
# Toplevel Makefile options
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
ifeq ($(BR2_PACKAGE_LIBGLIB12),y)
|
|
||||||
TARGETS+=libglib12
|
|
||||||
endif
|
|
File diff suppressed because it is too large
Load Diff
@ -1,9 +0,0 @@
|
|||||||
config BR2_PACKAGE_LIBGTK12
|
|
||||||
bool "libgtk12"
|
|
||||||
depends on BR2_DEPRECATED
|
|
||||||
select BR2_PACKAGE_LIBGLIB12
|
|
||||||
depends on BR2_PACKAGE_XORG7
|
|
||||||
help
|
|
||||||
The GTK+ graphical user interface library
|
|
||||||
|
|
||||||
http://www.gtk.org/
|
|
@ -1,643 +0,0 @@
|
|||||||
fixup configure.in, acinclude.m4 and Makefile.am's for reconfigurability. make
|
|
||||||
gtk-config use pkg-config
|
|
||||||
|
|
||||||
#
|
|
||||||
# Patch managed by http://www.holgerschurig.de/patcher.html
|
|
||||||
#
|
|
||||||
|
|
||||||
--- gtk+-1.2.10/configure.in~gtk+1.2-reconf-fix
|
|
||||||
+++ gtk+-1.2.10/configure.in
|
|
||||||
@@ -17,7 +17,9 @@
|
|
||||||
|
|
||||||
dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
|
|
||||||
dnl are available for $ac_help expansion (don't we all *love* autoconf?)
|
|
||||||
-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
|
|
||||||
+ifdef([AC_DIVERSION_NOTICE],
|
|
||||||
+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
|
|
||||||
+ [AC_DIVERT_PUSH(NOTICE)])dnl
|
|
||||||
#
|
|
||||||
# Making releases:
|
|
||||||
# GTK_MICRO_VERSION += 1;
|
|
||||||
@@ -76,7 +78,10 @@
|
|
||||||
|
|
||||||
dnl figure debugging default, prior to $ac_help setup
|
|
||||||
dnl
|
|
||||||
-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
|
|
||||||
+ifdef([AC_DIVERSION_NOTICE],
|
|
||||||
+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
|
|
||||||
+ [AC_DIVERT_PUSH(NOTICE)])dnl
|
|
||||||
+
|
|
||||||
if test `expr $GTK_MINOR_VERSION \% 2` = 1 ; then
|
|
||||||
debug_default=yes
|
|
||||||
else
|
|
||||||
@@ -292,12 +297,9 @@
|
|
||||||
AC_SUBST(GLIB_DEPLIBS)
|
|
||||||
|
|
||||||
# Find the X11 include and library directories
|
|
||||||
-AC_PATH_X
|
|
||||||
AC_PATH_XTRA
|
|
||||||
|
|
||||||
-if test "x$x_includes" = "x"; then
|
|
||||||
- x_includes="/usr/include"
|
|
||||||
-fi
|
|
||||||
+PKG_CHECK_MODULES(X,x11 xau)
|
|
||||||
|
|
||||||
saved_cflags="$CFLAGS"
|
|
||||||
saved_ldflags="$LDFLAGS"
|
|
||||||
--- gtk+-1.2.10/gdk/Makefile.am~gtk+1.2-reconf-fix
|
|
||||||
+++ gtk+-1.2.10/gdk/Makefile.am
|
|
||||||
@@ -31,7 +31,7 @@
|
|
||||||
# setup source file variables
|
|
||||||
#
|
|
||||||
# GDK header files for public installation (non-generated)
|
|
||||||
-gdk_public_h_sources = @STRIP_BEGIN@ \
|
|
||||||
+gdk_public_h_sources = \
|
|
||||||
gdk.h \
|
|
||||||
gdkcursors.h \
|
|
||||||
gdkrgb.h \
|
|
||||||
@@ -39,9 +39,9 @@
|
|
||||||
gdkkeysyms.h \
|
|
||||||
gdkprivate.h \
|
|
||||||
gdktypes.h \
|
|
||||||
- gdkx.h \
|
|
||||||
-@STRIP_END@
|
|
||||||
-gdk_c_sources = @STRIP_BEGIN@ \
|
|
||||||
+ gdkx.h
|
|
||||||
+
|
|
||||||
+gdk_c_sources = \
|
|
||||||
gdk.c \
|
|
||||||
gdkcc.c \
|
|
||||||
gdkcolor.c \
|
|
||||||
@@ -72,18 +72,16 @@
|
|
||||||
MwmUtil.h \
|
|
||||||
gxid_lib.h \
|
|
||||||
gxid_proto.h \
|
|
||||||
- gxid_lib.c \
|
|
||||||
-@STRIP_END@
|
|
||||||
+ gxid_lib.c
|
|
||||||
|
|
||||||
#
|
|
||||||
# setup GDK sources and their dependancies
|
|
||||||
#
|
|
||||||
libgdkinclude_HEADERS = $(gdk_public_h_sources)
|
|
||||||
libgdk_la_SOURCES = $(gdk_c_sources)
|
|
||||||
-MAINTAINERCLEANFILES +=
|
|
||||||
-EXTRA_HEADERS +=
|
|
||||||
-EXTRA_DIST +=
|
|
||||||
-EXTRA_DIST +=
|
|
||||||
+MAINTAINERCLEANFILES =
|
|
||||||
+EXTRA_HEADERS =
|
|
||||||
+EXTRA_DIST =
|
|
||||||
|
|
||||||
#
|
|
||||||
# rules to generate built sources
|
|
||||||
--- gtk+-1.2.10/gtk/Makefile.am~gtk+1.2-reconf-fix
|
|
||||||
+++ gtk+-1.2.10/gtk/Makefile.am
|
|
||||||
@@ -39,7 +39,7 @@
|
|
||||||
# setup source file variables
|
|
||||||
#
|
|
||||||
# GTK+ header files for public installation (non-generated)
|
|
||||||
-gtk_public_h_sources = @STRIP_BEGIN@ \
|
|
||||||
+gtk_public_h_sources = \
|
|
||||||
gtk.h \
|
|
||||||
gtkaccelgroup.h \
|
|
||||||
gtkaccellabel.h \
|
|
||||||
@@ -148,13 +148,13 @@
|
|
||||||
gtkvscrollbar.h \
|
|
||||||
gtkvseparator.h \
|
|
||||||
gtkwidget.h \
|
|
||||||
- gtkwindow.h \
|
|
||||||
-@STRIP_END@
|
|
||||||
+ gtkwindow.h
|
|
||||||
+
|
|
||||||
# GTK+ header files that don't get installed
|
|
||||||
-gtk_private_h_sources = @STRIP_BEGIN@ \
|
|
||||||
-@STRIP_END@
|
|
||||||
+gtk_private_h_sources =
|
|
||||||
+
|
|
||||||
# GTK+ C sources to build the library from
|
|
||||||
-gtk_c_sources = @STRIP_BEGIN@ \
|
|
||||||
+gtk_c_sources = \
|
|
||||||
gtkaccelgroup.c \
|
|
||||||
gtkaccellabel.c \
|
|
||||||
gtkadjustment.c \
|
|
||||||
@@ -262,8 +262,8 @@
|
|
||||||
gtkwidget.c \
|
|
||||||
gtkwindow.c \
|
|
||||||
fnmatch.c \
|
|
||||||
- fnmatch.h \
|
|
||||||
-@STRIP_END@
|
|
||||||
+ fnmatch.h
|
|
||||||
+
|
|
||||||
# we use our own built_sources variable rules to avoid automake's
|
|
||||||
# BUILT_SOURCES oddities
|
|
||||||
# we generate frequently rebuild files piggyback on a stamp file, so sources
|
|
||||||
@@ -271,7 +271,7 @@
|
|
||||||
# content
|
|
||||||
#
|
|
||||||
# built sources that don't get installed
|
|
||||||
-gtk_built_sources = @STRIP_BEGIN@ \
|
|
||||||
+gtk_built_sources = \
|
|
||||||
stamp-gtk.defs \
|
|
||||||
stamp-gtktypebuiltins.h \
|
|
||||||
stamp-gtkmarshal.h \
|
|
||||||
@@ -279,17 +279,18 @@
|
|
||||||
gtktypebuiltins_ids.c \
|
|
||||||
gtktypebuiltins_evals.c \
|
|
||||||
gtkmarshal.c \
|
|
||||||
- gtk.defs \
|
|
||||||
-@STRIP_END@
|
|
||||||
+ gtk.defs
|
|
||||||
+
|
|
||||||
+
|
|
||||||
# built sources that get installed with the header files
|
|
||||||
-gtk_built_public_sources = @STRIP_BEGIN@ \
|
|
||||||
+gtk_built_public_sources = \
|
|
||||||
gtkmarshal.h \
|
|
||||||
- gtktypebuiltins.h \
|
|
||||||
-@STRIP_END@
|
|
||||||
+ gtktypebuiltins.h
|
|
||||||
+
|
|
||||||
# non-header sources (headers should be specified in the above variables)
|
|
||||||
# that don't serve as direct make target sources, i.e. they don't have
|
|
||||||
# their own .lo rules and don't get publically installed
|
|
||||||
-gtk_extra_sources = @STRIP_BEGIN@ \
|
|
||||||
+gtk_extra_sources = \
|
|
||||||
gtkfeatures.h.in \
|
|
||||||
makeenums.pl \
|
|
||||||
makeenums.awk \
|
|
||||||
@@ -298,8 +299,8 @@
|
|
||||||
gtkargcollector.c \
|
|
||||||
gtk-boxed.defs \
|
|
||||||
genmarshal.pl \
|
|
||||||
- gtkmarshal.list \
|
|
||||||
-@STRIP_END@
|
|
||||||
+ gtkmarshal.list
|
|
||||||
+
|
|
||||||
# Extra headers that are used for enum type array/id generation
|
|
||||||
gdk_headers = @STRIP_BEGIN@ \
|
|
||||||
../gdk/gdktypes.h \
|
|
||||||
@@ -311,9 +312,9 @@
|
|
||||||
#
|
|
||||||
libgtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkfeatures.h
|
|
||||||
libgtk_la_SOURCES = $(gtk_c_sources)
|
|
||||||
-MAINTAINERCLEANFILES += $(gtk_built_public_sources) $(gtk_built_sources)
|
|
||||||
-EXTRA_HEADERS +=
|
|
||||||
-EXTRA_DIST += $(gtk_private_h_sources)
|
|
||||||
+MAINTAINERCLEANFILES = $(gtk_built_public_sources) $(gtk_built_sources)
|
|
||||||
+EXTRA_HEADERS =
|
|
||||||
+EXTRA_DIST = $(gtk_private_h_sources)
|
|
||||||
EXTRA_DIST += $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources)
|
|
||||||
|
|
||||||
#
|
|
||||||
@@ -321,7 +322,7 @@
|
|
||||||
#
|
|
||||||
# setup autogeneration dependancies
|
|
||||||
gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
|
|
||||||
-CLEANFILES += $(gen_sources)
|
|
||||||
+CLEANFILES = $(gen_sources)
|
|
||||||
COPYING: $(gtk_built_public_sources) $(gtk_built_sources)
|
|
||||||
$(OBJECTS): COPYING # this is our oldest-source-stamp
|
|
||||||
# initial creation of the real stamp-* files
|
|
||||||
--- gtk+-1.2.10/docs/Makefile.am~gtk+1.2-reconf-fix
|
|
||||||
+++ gtk+-1.2.10/docs/Makefile.am
|
|
||||||
@@ -166,7 +166,7 @@
|
|
||||||
echo $$p; \
|
|
||||||
done
|
|
||||||
|
|
||||||
-EXTRA_DIST += \
|
|
||||||
+EXTRA_DIST = \
|
|
||||||
Changes-1.2.txt \
|
|
||||||
debugging.txt \
|
|
||||||
developers.txt \
|
|
||||||
--- gtk+-1.2.10/acinclude.m4~gtk+1.2-reconf-fix
|
|
||||||
+++ gtk+-1.2.10/acinclude.m4
|
|
||||||
@@ -21,428 +21,6 @@
|
|
||||||
## configuration script generated by Autoconf, you may include it under
|
|
||||||
## the same distribution terms that you use for the rest of that program.
|
|
||||||
|
|
||||||
-# serial 40 AC_PROG_LIBTOOL
|
|
||||||
-AC_DEFUN(AC_PROG_LIBTOOL,
|
|
||||||
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
|
|
||||||
-
|
|
||||||
-# Save cache, so that ltconfig can load it
|
|
||||||
-AC_CACHE_SAVE
|
|
||||||
-
|
|
||||||
-# Actually configure libtool. ac_aux_dir is where install-sh is found.
|
|
||||||
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
|
|
||||||
-LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
|
|
||||||
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
|
|
||||||
-DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
|
|
||||||
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
|
|
||||||
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
|
|
||||||
-|| AC_MSG_ERROR([libtool configure failed])
|
|
||||||
-
|
|
||||||
-# Reload cache, that may have been modified by ltconfig
|
|
||||||
-AC_CACHE_LOAD
|
|
||||||
-
|
|
||||||
-# This can be used to rebuild libtool when needed
|
|
||||||
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
|
|
||||||
-
|
|
||||||
-# Always use our own libtool.
|
|
||||||
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
|
||||||
-AC_SUBST(LIBTOOL)dnl
|
|
||||||
-
|
|
||||||
-# Redirect the config.log output again, so that the ltconfig log is not
|
|
||||||
-# clobbered by the next message.
|
|
||||||
-exec 5>>./config.log
|
|
||||||
-])
|
|
||||||
-
|
|
||||||
-AC_DEFUN(AC_LIBTOOL_SETUP,
|
|
||||||
-[AC_PREREQ(2.13)dnl
|
|
||||||
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
|
|
||||||
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
|
|
||||||
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
|
|
||||||
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
||||||
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
|
|
||||||
-AC_REQUIRE([AC_PROG_RANLIB])dnl
|
|
||||||
-AC_REQUIRE([AC_PROG_CC])dnl
|
|
||||||
-AC_REQUIRE([AC_PROG_LD])dnl
|
|
||||||
-AC_REQUIRE([AC_PROG_NM])dnl
|
|
||||||
-AC_REQUIRE([AC_PROG_LN_S])dnl
|
|
||||||
-dnl
|
|
||||||
-
|
|
||||||
-case "$target" in
|
|
||||||
-NONE) lt_target="$host" ;;
|
|
||||||
-*) lt_target="$target" ;;
|
|
||||||
-esac
|
|
||||||
-
|
|
||||||
-# Check for any special flags to pass to ltconfig.
|
|
||||||
-libtool_flags="--cache-file=$cache_file"
|
|
||||||
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
|
|
||||||
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
|
|
||||||
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
|
|
||||||
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
|
|
||||||
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
|
|
||||||
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
|
|
||||||
-[libtool_flags="$libtool_flags --enable-dlopen"])
|
|
||||||
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
|
|
||||||
-[libtool_flags="$libtool_flags --enable-win32-dll"])
|
|
||||||
-AC_ARG_ENABLE(libtool-lock,
|
|
||||||
- [ --disable-libtool-lock avoid locking (might break parallel builds)])
|
|
||||||
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
|
|
||||||
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
|
|
||||||
-
|
|
||||||
-# Some flags need to be propagated to the compiler or linker for good
|
|
||||||
-# libtool support.
|
|
||||||
-case "$lt_target" in
|
|
||||||
-*-*-irix6*)
|
|
||||||
- # Find out which ABI we are using.
|
|
||||||
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
|
|
||||||
- if AC_TRY_EVAL(ac_compile); then
|
|
||||||
- case "`/usr/bin/file conftest.o`" in
|
|
||||||
- *32-bit*)
|
|
||||||
- LD="${LD-ld} -32"
|
|
||||||
- ;;
|
|
||||||
- *N32*)
|
|
||||||
- LD="${LD-ld} -n32"
|
|
||||||
- ;;
|
|
||||||
- *64-bit*)
|
|
||||||
- LD="${LD-ld} -64"
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
- fi
|
|
||||||
- rm -rf conftest*
|
|
||||||
- ;;
|
|
||||||
-
|
|
||||||
-*-*-sco3.2v5*)
|
|
||||||
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
|
|
||||||
- SAVE_CFLAGS="$CFLAGS"
|
|
||||||
- CFLAGS="$CFLAGS -belf"
|
|
||||||
- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
|
|
||||||
- [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
|
|
||||||
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
|
|
||||||
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
|
|
||||||
- CFLAGS="$SAVE_CFLAGS"
|
|
||||||
- fi
|
|
||||||
- ;;
|
|
||||||
-
|
|
||||||
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
|
|
||||||
-[*-*-cygwin* | *-*-mingw*)
|
|
||||||
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
|
||||||
- AC_CHECK_TOOL(AS, as, false)
|
|
||||||
- AC_CHECK_TOOL(OBJDUMP, objdump, false)
|
|
||||||
- ;;
|
|
||||||
-])
|
|
||||||
-esac
|
|
||||||
-])
|
|
||||||
-
|
|
||||||
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
|
|
||||||
-AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
|
|
||||||
-
|
|
||||||
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
|
|
||||||
-AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
|
|
||||||
-
|
|
||||||
-# AC_ENABLE_SHARED - implement the --enable-shared flag
|
|
||||||
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
|
|
||||||
-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
|
||||||
-# `yes'.
|
|
||||||
-AC_DEFUN(AC_ENABLE_SHARED, [dnl
|
|
||||||
-define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
|
|
||||||
-AC_ARG_ENABLE(shared,
|
|
||||||
-changequote(<<, >>)dnl
|
|
||||||
-<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
|
|
||||||
-changequote([, ])dnl
|
|
||||||
-[p=${PACKAGE-default}
|
|
||||||
-case "$enableval" in
|
|
||||||
-yes) enable_shared=yes ;;
|
|
||||||
-no) enable_shared=no ;;
|
|
||||||
-*)
|
|
||||||
- enable_shared=no
|
|
||||||
- # Look at the argument we got. We use all the common list separators.
|
|
||||||
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
|
|
||||||
- for pkg in $enableval; do
|
|
||||||
- if test "X$pkg" = "X$p"; then
|
|
||||||
- enable_shared=yes
|
|
||||||
- fi
|
|
||||||
- done
|
|
||||||
- IFS="$ac_save_ifs"
|
|
||||||
- ;;
|
|
||||||
-esac],
|
|
||||||
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
|
|
||||||
-])
|
|
||||||
-
|
|
||||||
-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
|
|
||||||
-AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
|
||||||
-AC_ENABLE_SHARED(no)])
|
|
||||||
-
|
|
||||||
-# AC_ENABLE_STATIC - implement the --enable-static flag
|
|
||||||
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
|
|
||||||
-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
|
||||||
-# `yes'.
|
|
||||||
-AC_DEFUN(AC_ENABLE_STATIC, [dnl
|
|
||||||
-define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
|
|
||||||
-AC_ARG_ENABLE(static,
|
|
||||||
-changequote(<<, >>)dnl
|
|
||||||
-<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
|
|
||||||
-changequote([, ])dnl
|
|
||||||
-[p=${PACKAGE-default}
|
|
||||||
-case "$enableval" in
|
|
||||||
-yes) enable_static=yes ;;
|
|
||||||
-no) enable_static=no ;;
|
|
||||||
-*)
|
|
||||||
- enable_static=no
|
|
||||||
- # Look at the argument we got. We use all the common list separators.
|
|
||||||
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
|
|
||||||
- for pkg in $enableval; do
|
|
||||||
- if test "X$pkg" = "X$p"; then
|
|
||||||
- enable_static=yes
|
|
||||||
- fi
|
|
||||||
- done
|
|
||||||
- IFS="$ac_save_ifs"
|
|
||||||
- ;;
|
|
||||||
-esac],
|
|
||||||
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
|
|
||||||
-])
|
|
||||||
-
|
|
||||||
-# AC_DISABLE_STATIC - set the default static flag to --disable-static
|
|
||||||
-AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
|
||||||
-AC_ENABLE_STATIC(no)])
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
|
|
||||||
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
|
|
||||||
-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
|
||||||
-# `yes'.
|
|
||||||
-AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
|
|
||||||
-define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
|
|
||||||
-AC_ARG_ENABLE(fast-install,
|
|
||||||
-changequote(<<, >>)dnl
|
|
||||||
-<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
|
|
||||||
-changequote([, ])dnl
|
|
||||||
-[p=${PACKAGE-default}
|
|
||||||
-case "$enableval" in
|
|
||||||
-yes) enable_fast_install=yes ;;
|
|
||||||
-no) enable_fast_install=no ;;
|
|
||||||
-*)
|
|
||||||
- enable_fast_install=no
|
|
||||||
- # Look at the argument we got. We use all the common list separators.
|
|
||||||
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
|
|
||||||
- for pkg in $enableval; do
|
|
||||||
- if test "X$pkg" = "X$p"; then
|
|
||||||
- enable_fast_install=yes
|
|
||||||
- fi
|
|
||||||
- done
|
|
||||||
- IFS="$ac_save_ifs"
|
|
||||||
- ;;
|
|
||||||
-esac],
|
|
||||||
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
|
|
||||||
-])
|
|
||||||
-
|
|
||||||
-# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
|
|
||||||
-AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
|
||||||
-AC_ENABLE_FAST_INSTALL(no)])
|
|
||||||
-
|
|
||||||
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
|
|
||||||
-AC_DEFUN(AC_PROG_LD,
|
|
||||||
-[AC_ARG_WITH(gnu-ld,
|
|
||||||
-[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
|
|
||||||
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
|
|
||||||
-AC_REQUIRE([AC_PROG_CC])dnl
|
|
||||||
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
||||||
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
|
|
||||||
-ac_prog=ld
|
|
||||||
-if test "$ac_cv_prog_gcc" = yes; then
|
|
||||||
- # Check if gcc -print-prog-name=ld gives a path.
|
|
||||||
- AC_MSG_CHECKING([for ld used by GCC])
|
|
||||||
- ac_prog=`($CC -print-prog-name=ld) 2>&5`
|
|
||||||
- case "$ac_prog" in
|
|
||||||
- # Accept absolute paths.
|
|
||||||
-changequote(,)dnl
|
|
||||||
- [\\/]* | [A-Za-z]:[\\/]*)
|
|
||||||
- re_direlt='/[^/][^/]*/\.\./'
|
|
||||||
-changequote([,])dnl
|
|
||||||
- # Canonicalize the path of ld
|
|
||||||
- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
|
|
||||||
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
|
|
||||||
- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
|
|
||||||
- done
|
|
||||||
- test -z "$LD" && LD="$ac_prog"
|
|
||||||
- ;;
|
|
||||||
- "")
|
|
||||||
- # If it fails, then pretend we aren't using GCC.
|
|
||||||
- ac_prog=ld
|
|
||||||
- ;;
|
|
||||||
- *)
|
|
||||||
- # If it is relative, then search for the first ld in PATH.
|
|
||||||
- with_gnu_ld=unknown
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-elif test "$with_gnu_ld" = yes; then
|
|
||||||
- AC_MSG_CHECKING([for GNU ld])
|
|
||||||
-else
|
|
||||||
- AC_MSG_CHECKING([for non-GNU ld])
|
|
||||||
-fi
|
|
||||||
-AC_CACHE_VAL(ac_cv_path_LD,
|
|
||||||
-[if test -z "$LD"; then
|
|
||||||
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
|
|
||||||
- for ac_dir in $PATH; do
|
|
||||||
- test -z "$ac_dir" && ac_dir=.
|
|
||||||
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
|
|
||||||
- ac_cv_path_LD="$ac_dir/$ac_prog"
|
|
||||||
- # Check to see if the program is GNU ld. I'd rather use --version,
|
|
||||||
- # but apparently some GNU ld's only accept -v.
|
|
||||||
- # Break only if it was the GNU/non-GNU ld that we prefer.
|
|
||||||
- if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
|
|
||||||
- test "$with_gnu_ld" != no && break
|
|
||||||
- else
|
|
||||||
- test "$with_gnu_ld" != yes && break
|
|
||||||
- fi
|
|
||||||
- fi
|
|
||||||
- done
|
|
||||||
- IFS="$ac_save_ifs"
|
|
||||||
-else
|
|
||||||
- ac_cv_path_LD="$LD" # Let the user override the test with a path.
|
|
||||||
-fi])
|
|
||||||
-LD="$ac_cv_path_LD"
|
|
||||||
-if test -n "$LD"; then
|
|
||||||
- AC_MSG_RESULT($LD)
|
|
||||||
-else
|
|
||||||
- AC_MSG_RESULT(no)
|
|
||||||
-fi
|
|
||||||
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
|
|
||||||
-AC_PROG_LD_GNU
|
|
||||||
-])
|
|
||||||
-
|
|
||||||
-AC_DEFUN(AC_PROG_LD_GNU,
|
|
||||||
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
|
|
||||||
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
|
||||||
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
|
|
||||||
- ac_cv_prog_gnu_ld=yes
|
|
||||||
-else
|
|
||||||
- ac_cv_prog_gnu_ld=no
|
|
||||||
-fi])
|
|
||||||
-])
|
|
||||||
-
|
|
||||||
-# AC_PROG_NM - find the path to a BSD-compatible name lister
|
|
||||||
-AC_DEFUN(AC_PROG_NM,
|
|
||||||
-[AC_MSG_CHECKING([for BSD-compatible nm])
|
|
||||||
-AC_CACHE_VAL(ac_cv_path_NM,
|
|
||||||
-[if test -n "$NM"; then
|
|
||||||
- # Let the user override the test.
|
|
||||||
- ac_cv_path_NM="$NM"
|
|
||||||
-else
|
|
||||||
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
|
|
||||||
- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
|
|
||||||
- test -z "$ac_dir" && ac_dir=.
|
|
||||||
- if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
|
|
||||||
- # Check to see if the nm accepts a BSD-compat flag.
|
|
||||||
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
|
|
||||||
- # nm: unknown option "B" ignored
|
|
||||||
- if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
|
|
||||||
- ac_cv_path_NM="$ac_dir/nm -B"
|
|
||||||
- break
|
|
||||||
- elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
|
|
||||||
- ac_cv_path_NM="$ac_dir/nm -p"
|
|
||||||
- break
|
|
||||||
- else
|
|
||||||
- ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
|
|
||||||
- continue # so that we can try to find one that supports BSD flags
|
|
||||||
- fi
|
|
||||||
- fi
|
|
||||||
- done
|
|
||||||
- IFS="$ac_save_ifs"
|
|
||||||
- test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
|
|
||||||
-fi])
|
|
||||||
-NM="$ac_cv_path_NM"
|
|
||||||
-AC_MSG_RESULT([$NM])
|
|
||||||
-])
|
|
||||||
-
|
|
||||||
-# AC_CHECK_LIBM - check for math library
|
|
||||||
-AC_DEFUN(AC_CHECK_LIBM,
|
|
||||||
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
||||||
-LIBM=
|
|
||||||
-case "$lt_target" in
|
|
||||||
-*-*-beos* | *-*-cygwin*)
|
|
||||||
- # These system don't have libm
|
|
||||||
- ;;
|
|
||||||
-*-ncr-sysv4.3*)
|
|
||||||
- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
|
|
||||||
- AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
|
|
||||||
- ;;
|
|
||||||
-*)
|
|
||||||
- AC_CHECK_LIB(m, main, LIBM="-lm")
|
|
||||||
- ;;
|
|
||||||
-esac
|
|
||||||
-])
|
|
||||||
-
|
|
||||||
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
|
|
||||||
-# the libltdl convenience library, adds --enable-ltdl-convenience to
|
|
||||||
-# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
|
|
||||||
-# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
|
|
||||||
-# to be `${top_builddir}/libltdl'. Make sure you start DIR with
|
|
||||||
-# '${top_builddir}/' (note the single quotes!) if your package is not
|
|
||||||
-# flat, and, if you're not using automake, define top_builddir as
|
|
||||||
-# appropriate in the Makefiles.
|
|
||||||
-AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
|
||||||
- case "$enable_ltdl_convenience" in
|
|
||||||
- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
|
|
||||||
- "") enable_ltdl_convenience=yes
|
|
||||||
- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
|
|
||||||
- esac
|
|
||||||
- LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
|
|
||||||
- INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
|
|
||||||
-])
|
|
||||||
-
|
|
||||||
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
|
|
||||||
-# the libltdl installable library, and adds --enable-ltdl-install to
|
|
||||||
-# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
|
|
||||||
-# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
|
|
||||||
-# to be `${top_builddir}/libltdl'. Make sure you start DIR with
|
|
||||||
-# '${top_builddir}/' (note the single quotes!) if your package is not
|
|
||||||
-# flat, and, if you're not using automake, define top_builddir as
|
|
||||||
-# appropriate in the Makefiles.
|
|
||||||
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
|
|
||||||
-AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
|
||||||
- AC_CHECK_LIB(ltdl, main,
|
|
||||||
- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
|
|
||||||
- [if test x"$enable_ltdl_install" = xno; then
|
|
||||||
- AC_MSG_WARN([libltdl not installed, but installation disabled])
|
|
||||||
- else
|
|
||||||
- enable_ltdl_install=yes
|
|
||||||
- fi
|
|
||||||
- ])
|
|
||||||
- if test x"$enable_ltdl_install" = x"yes"; then
|
|
||||||
- ac_configure_args="$ac_configure_args --enable-ltdl-install"
|
|
||||||
- LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
|
|
||||||
- INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
|
|
||||||
- else
|
|
||||||
- ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
|
|
||||||
- LIBLTDL="-lltdl"
|
|
||||||
- INCLTDL=
|
|
||||||
- fi
|
|
||||||
-])
|
|
||||||
-
|
|
||||||
-dnl old names
|
|
||||||
-AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
|
|
||||||
-AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
|
|
||||||
-AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
|
|
||||||
-AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
|
|
||||||
-AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
|
|
||||||
-AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
|
|
||||||
-AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
|
|
||||||
-
|
|
||||||
-dnl This is just to silence aclocal about the macro not being used
|
|
||||||
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
|
|
||||||
-
|
|
||||||
-# Macro to add for using GNU gettext.
|
|
||||||
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
|
|
||||||
-#
|
|
||||||
-# Modified to never use included libintl.
|
|
||||||
-# Owen Taylor <otaylor@redhat.com>, 12/15/1998
|
|
||||||
-#
|
|
||||||
-#
|
|
||||||
-# This file can be copied and used freely without restrictions. It can
|
|
||||||
-# be used in projects which are not available under the GNU Public License
|
|
||||||
-# but which still want to provide support for the GNU gettext functionality.
|
|
||||||
-# Please note that the actual code is *not* freely available.
|
|
||||||
-
|
|
||||||
-# serial 5
|
|
||||||
-
|
|
||||||
AC_DEFUN(AM_GTK_WITH_NLS,
|
|
||||||
[AC_MSG_CHECKING([whether NLS is requested])
|
|
||||||
dnl Default is enabled NLS
|
|
@ -1,105 +0,0 @@
|
|||||||
#############################################################
|
|
||||||
#
|
|
||||||
# libgtk1.2
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
LIBGTK12_VERSION:=1.2.10
|
|
||||||
LIBGTK12_SOURCE:=gtk+-$(LIBGTK12_VERSION).tar.gz
|
|
||||||
LIBGTK12_SITE:=http://ftp.gnome.org/pub/gnome/sources/gtk+/1.2
|
|
||||||
LIBGTK12_CAT:=$(ZCAT)
|
|
||||||
LIBGTK12_DIR:=$(BUILD_DIR)/gtk+-$(LIBGTK12_VERSION)
|
|
||||||
LIBGTK12_BINARY:=libgtk.a
|
|
||||||
|
|
||||||
|
|
||||||
$(DL_DIR)/$(LIBGTK12_SOURCE):
|
|
||||||
$(call DOWNLOAD,$(LIBGTK12_SITE),$(LIBGTK12_SOURCE))
|
|
||||||
|
|
||||||
libgtk12-source: $(DL_DIR)/$(LIBGTK12_SOURCE)
|
|
||||||
|
|
||||||
$(LIBGTK12_DIR)/.unpacked: $(DL_DIR)/$(LIBGTK12_SOURCE)
|
|
||||||
$(LIBGTK12_CAT) $(DL_DIR)/$(LIBGTK12_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
|
||||||
toolchain/patch-kernel.sh $(LIBGTK12_DIR) package/libgtk12/ \*.patch*
|
|
||||||
$(CONFIG_UPDATE) $(LIBGTK12_DIR)
|
|
||||||
touch $(LIBGTK12_DIR)/.unpacked
|
|
||||||
|
|
||||||
$(LIBGTK12_DIR)/.configured: $(LIBGTK12_DIR)/.unpacked
|
|
||||||
(cd $(LIBGTK12_DIR); rm -rf config.cache; \
|
|
||||||
$(TARGET_CONFIGURE_OPTS) \
|
|
||||||
$(TARGET_CONFIGURE_ARGS) \
|
|
||||||
GLIB_CONFIG=$(STAGING_DIR)/bin/glib-config \
|
|
||||||
./configure $(QUIET) \
|
|
||||||
--target=$(GNU_TARGET_NAME) \
|
|
||||||
--host=$(GNU_TARGET_NAME) \
|
|
||||||
--build=$(GNU_HOST_NAME) \
|
|
||||||
--prefix=/usr \
|
|
||||||
--exec-prefix=/usr \
|
|
||||||
--bindir=/usr/bin \
|
|
||||||
--sbindir=/usr/sbin \
|
|
||||||
--libdir=/lib \
|
|
||||||
--libexecdir=/usr/lib \
|
|
||||||
--sysconfdir=/etc \
|
|
||||||
--datadir=/usr/share \
|
|
||||||
--localstatedir=/var \
|
|
||||||
--includedir=/usr/include \
|
|
||||||
--mandir=/usr/man \
|
|
||||||
--infodir=/usr/info \
|
|
||||||
$(DISABLE_NLS) \
|
|
||||||
--x-includes=$(STAGING_DIR)/usr/include/X11 \
|
|
||||||
--x-libraries=$(STAGING_DIR)/usr/lib \
|
|
||||||
--enable-debug=no \
|
|
||||||
--disable-glibtest \
|
|
||||||
--disable-xim \
|
|
||||||
--enable-shared \
|
|
||||||
)
|
|
||||||
touch $(LIBGTK12_DIR)/.configured
|
|
||||||
|
|
||||||
$(LIBGTK12_DIR)/gtk/.libs/$(LIBGTK12_BINARY): $(LIBGTK12_DIR)/.configured
|
|
||||||
$(MAKE) CC="$(TARGET_CC)" -C $(LIBGTK12_DIR)
|
|
||||||
touch -c $(LIBGTK12_DIR)/gtk/.libs/$(LIBGTK12_BINARY)
|
|
||||||
|
|
||||||
$(STAGING_DIR)/lib/$(LIBGTK12_BINARY): $(LIBGTK12_DIR)/gtk/.libs/$(LIBGTK12_BINARY)
|
|
||||||
$(MAKE) prefix=$(STAGING_DIR) \
|
|
||||||
exec_prefix=$(STAGING_DIR) \
|
|
||||||
bindir=$(STAGING_DIR)/bin \
|
|
||||||
sbindir=$(STAGING_DIR)/sbin \
|
|
||||||
libexecdir=$(STAGING_DIR)/bin \
|
|
||||||
datadir=$(STAGING_DIR)/share \
|
|
||||||
sysconfdir=$(STAGING_DIR)/etc \
|
|
||||||
sharedstatedir=$(STAGING_DIR)/com \
|
|
||||||
localstatedir=$(STAGING_DIR)/var \
|
|
||||||
libdir=$(STAGING_DIR)/lib \
|
|
||||||
includedir=$(STAGING_DIR)/usr/include \
|
|
||||||
oldincludedir=$(STAGING_DIR)/include \
|
|
||||||
infodir=$(STAGING_DIR)/info \
|
|
||||||
mandir=$(STAGING_DIR)/man \
|
|
||||||
-C $(LIBGTK12_DIR) install
|
|
||||||
touch -c $(STAGING_DIR)/lib/$(LIBGTK12_BINARY)
|
|
||||||
|
|
||||||
$(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1: $(STAGING_DIR)/lib/$(LIBGTK12_BINARY)
|
|
||||||
cp -a $(STAGING_DIR)/lib/libgtk.so $(TARGET_DIR)/lib/
|
|
||||||
cp -a $(STAGING_DIR)/lib/libgtk-1.2.so.0 $(TARGET_DIR)/lib/
|
|
||||||
cp -a $(STAGING_DIR)/lib/libgtk-1.2.so.0.9.1 $(TARGET_DIR)/lib/
|
|
||||||
cp -a $(STAGING_DIR)/lib/libgdk.so $(TARGET_DIR)/lib/
|
|
||||||
cp -a $(STAGING_DIR)/lib/libgdk-1.2.so.0 $(TARGET_DIR)/lib/
|
|
||||||
cp -a $(STAGING_DIR)/lib/libgdk-1.2.so.0.9.1 $(TARGET_DIR)/lib/
|
|
||||||
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
|
|
||||||
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgdk-1.2.so.0.9.1
|
|
||||||
touch -c $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
|
|
||||||
|
|
||||||
libgtk12: libglib12 xserver_xorg-server $(TARGET_DIR)/lib/libgtk-1.2.so.0.9.1
|
|
||||||
|
|
||||||
libgtk12-clean:
|
|
||||||
rm -f $(TARGET_DIR)/lib/libgtk* $(TARGET_DIR)/lib/libgdk*
|
|
||||||
-$(MAKE) -C $(LIBGTK12_DIR) clean
|
|
||||||
|
|
||||||
libgtk12-dirclean:
|
|
||||||
rm -rf $(LIBGTK12_DIR)
|
|
||||||
|
|
||||||
#############################################################
|
|
||||||
#
|
|
||||||
# Toplevel Makefile options
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
ifeq ($(BR2_PACKAGE_LIBGTK12),y)
|
|
||||||
TARGETS+=libgtk12
|
|
||||||
endif
|
|
@ -1,267 +0,0 @@
|
|||||||
remove mb and XWC support, as tinyx doesnt support this
|
|
||||||
|
|
||||||
#
|
|
||||||
# Patch managed by http://www.holgerschurig.de/patcher.html
|
|
||||||
#
|
|
||||||
|
|
||||||
--- gtk+-1.2.10/gdk/gdkdraw.c~no-xwc
|
|
||||||
+++ gtk+-1.2.10/gdk/gdkdraw.c
|
|
||||||
@@ -236,12 +236,14 @@
|
|
||||||
strlen (string) / 2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
else if (font->type == GDK_FONT_FONTSET)
|
|
||||||
{
|
|
||||||
XFontSet fontset = (XFontSet) font_private->xfont;
|
|
||||||
XmbDrawString (drawable_private->xdisplay, drawable_private->xwindow,
|
|
||||||
fontset, gc_private->xgc, x, y, string, strlen (string));
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
else
|
|
||||||
g_error("undefined font type\n");
|
|
||||||
}
|
|
||||||
@@ -291,12 +293,14 @@
|
|
||||||
gc_private->xgc, x, y, (XChar2b *) text, text_length / 2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
else if (font->type == GDK_FONT_FONTSET)
|
|
||||||
{
|
|
||||||
XFontSet fontset = (XFontSet) font_private->xfont;
|
|
||||||
XmbDrawString (drawable_private->xdisplay, drawable_private->xwindow,
|
|
||||||
fontset, gc_private->xgc, x, y, text, text_length);
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
else
|
|
||||||
g_error("undefined font type\n");
|
|
||||||
}
|
|
||||||
@@ -337,6 +341,7 @@
|
|
||||||
g_free (glyphs);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
else if (font->type == GDK_FONT_FONTSET)
|
|
||||||
{
|
|
||||||
if (sizeof(GdkWChar) == sizeof(wchar_t))
|
|
||||||
@@ -357,6 +362,7 @@
|
|
||||||
g_free (text_wchar);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
else
|
|
||||||
g_error("undefined font type\n");
|
|
||||||
}
|
|
||||||
--- gtk+-1.2.10/gdk/gdkim.c~no-xwc
|
|
||||||
+++ gtk+-1.2.10/gdk/gdkim.c
|
|
||||||
@@ -121,6 +121,7 @@
|
|
||||||
|
|
||||||
current_locale = setlocale (LC_ALL, NULL);
|
|
||||||
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
if ((strcmp (current_locale, "C")) && (strcmp (current_locale, "POSIX")))
|
|
||||||
{
|
|
||||||
gdk_use_mb = TRUE;
|
|
||||||
@@ -145,7 +146,8 @@
|
|
||||||
GDK_NOTE (XIM,
|
|
||||||
g_message ("%s multi-byte string functions.",
|
|
||||||
gdk_use_mb ? "Using" : "Not using"));
|
|
||||||
-
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
return current_locale;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1551,6 +1553,7 @@
|
|
||||||
else
|
|
||||||
length = len;
|
|
||||||
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
if (gdk_use_mb)
|
|
||||||
{
|
|
||||||
XTextProperty tpr;
|
|
||||||
@@ -1589,6 +1592,7 @@
|
|
||||||
g_free (src_wc);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
gint i;
|
|
||||||
|
|
||||||
@@ -1644,6 +1648,7 @@
|
|
||||||
/* NoMem or LocaleNotSupp */
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
if (XwcTextPropertyToTextList (gdk_display, &tpr, &wstrs, &num_wstrs)
|
|
||||||
!= Success)
|
|
||||||
{
|
|
||||||
@@ -1659,6 +1664,7 @@
|
|
||||||
dest[len_cpy] = wstr_src[len_cpy];
|
|
||||||
XwcFreeStringList (wstrs);
|
|
||||||
return len_cpy;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
--- gtk+-1.2.10/gdk/gdkfont.c~no-xwc
|
|
||||||
+++ gtk+-1.2.10/gdk/gdkfont.c
|
|
||||||
@@ -244,9 +244,11 @@
|
|
||||||
gdk_xid_table_remove (((XFontStruct *) private->xfont)->fid);
|
|
||||||
XFreeFont (private->xdisplay, (XFontStruct *) private->xfont);
|
|
||||||
break;
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
case GDK_FONT_FONTSET:
|
|
||||||
XFreeFontSet (private->xdisplay, (XFontSet) private->xfont);
|
|
||||||
break;
|
|
||||||
+#endif
|
|
||||||
default:
|
|
||||||
g_error ("unknown font type.");
|
|
||||||
break;
|
|
||||||
@@ -292,6 +294,7 @@
|
|
||||||
return (((XFontStruct *) privatea->xfont)->fid ==
|
|
||||||
((XFontStruct *) privateb->xfont)->fid);
|
|
||||||
}
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
else if (fonta->type == GDK_FONT_FONTSET && fontb->type == GDK_FONT_FONTSET)
|
|
||||||
{
|
|
||||||
gchar *namea, *nameb;
|
|
||||||
@@ -301,6 +304,7 @@
|
|
||||||
|
|
||||||
return (strcmp(namea, nameb) == 0);
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
else
|
|
||||||
/* fontset != font */
|
|
||||||
return FALSE;
|
|
||||||
@@ -333,10 +337,12 @@
|
|
||||||
width = XTextWidth16 (xfont, (XChar2b *) string, strlen (string) / 2);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
case GDK_FONT_FONTSET:
|
|
||||||
fontset = (XFontSet) font_private->xfont;
|
|
||||||
width = XmbTextEscapement (fontset, string, strlen(string));
|
|
||||||
break;
|
|
||||||
+#endif
|
|
||||||
default:
|
|
||||||
width = 0;
|
|
||||||
}
|
|
||||||
@@ -372,10 +378,12 @@
|
|
||||||
width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
case GDK_FONT_FONTSET:
|
|
||||||
fontset = (XFontSet) private->xfont;
|
|
||||||
width = XmbTextEscapement (fontset, text, text_length);
|
|
||||||
break;
|
|
||||||
+#endif
|
|
||||||
default:
|
|
||||||
width = 0;
|
|
||||||
}
|
|
||||||
@@ -414,6 +422,7 @@
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
case GDK_FONT_FONTSET:
|
|
||||||
if (sizeof(GdkWChar) == sizeof(wchar_t))
|
|
||||||
{
|
|
||||||
@@ -431,6 +440,7 @@
|
|
||||||
g_free (text_wchar);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
+#endif
|
|
||||||
default:
|
|
||||||
width = 0;
|
|
||||||
}
|
|
||||||
@@ -474,10 +484,12 @@
|
|
||||||
width = XTextWidth (xfont, &character, 1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
case GDK_FONT_FONTSET:
|
|
||||||
fontset = (XFontSet) private->xfont;
|
|
||||||
width = XmbTextEscapement (fontset, &character, 1) ;
|
|
||||||
break;
|
|
||||||
+#endif
|
|
||||||
default:
|
|
||||||
width = 0;
|
|
||||||
}
|
|
||||||
@@ -523,6 +535,7 @@
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
case GDK_FONT_FONTSET:
|
|
||||||
fontset = (XFontSet) private->xfont;
|
|
||||||
{
|
|
||||||
@@ -530,6 +543,7 @@
|
|
||||||
width = XwcTextEscapement (fontset, &char_wc, 1) ;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
+#endif
|
|
||||||
default:
|
|
||||||
width = 0;
|
|
||||||
}
|
|
||||||
@@ -597,6 +611,7 @@
|
|
||||||
if (descent)
|
|
||||||
*descent = overall.descent;
|
|
||||||
break;
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
case GDK_FONT_FONTSET:
|
|
||||||
fontset = (XFontSet) private->xfont;
|
|
||||||
XmbTextExtents (fontset, text, text_length, &ink, &logical);
|
|
||||||
@@ -611,6 +626,7 @@
|
|
||||||
if (descent)
|
|
||||||
*descent = ink.y + ink.height;
|
|
||||||
break;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -664,6 +680,7 @@
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
case GDK_FONT_FONTSET:
|
|
||||||
fontset = (XFontSet) private->xfont;
|
|
||||||
|
|
||||||
@@ -691,6 +708,7 @@
|
|
||||||
if (descent)
|
|
||||||
*descent = ink.y + ink.height;
|
|
||||||
break;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -750,11 +768,13 @@
|
|
||||||
}
|
|
||||||
width = overall.rbearing;
|
|
||||||
break;
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
case GDK_FONT_FONTSET:
|
|
||||||
fontset = (XFontSet) private->xfont;
|
|
||||||
XmbTextExtents (fontset, text, text_length, &ink, &log);
|
|
||||||
width = ink.x + ink.width;
|
|
||||||
break;
|
|
||||||
+#endif
|
|
||||||
default:
|
|
||||||
width = 0;
|
|
||||||
}
|
|
||||||
@@ -818,11 +838,13 @@
|
|
||||||
}
|
|
||||||
height = overall.ascent + overall.descent;
|
|
||||||
break;
|
|
||||||
+#ifdef HAVE_XWC
|
|
||||||
case GDK_FONT_FONTSET:
|
|
||||||
fontset = (XFontSet) private->xfont;
|
|
||||||
XmbTextExtents (fontset, text, text_length, &ink, &log);
|
|
||||||
height = log.height;
|
|
||||||
break;
|
|
||||||
+#endif
|
|
||||||
default:
|
|
||||||
height = 0;
|
|
||||||
}
|
|
@ -1,15 +0,0 @@
|
|||||||
diff -NurBabdH gtk+-1.2.10/gtk/testrgb.c gtk+-1.2.10-timezone-fix/gtk/testrgb.c
|
|
||||||
--- gtk+-1.2.10/gtk/testrgb.c 2000-08-18 23:36:34.000000000 +0200
|
|
||||||
+++ gtk+-1.2.10-timezone-fix/gtk/testrgb.c 2005-03-03 11:18:09.000000000 +0100
|
|
||||||
@@ -49,7 +49,10 @@
|
|
||||||
get_time (void)
|
|
||||||
{
|
|
||||||
struct timeval tv;
|
|
||||||
- struct timezone tz;
|
|
||||||
+ struct timezone {
|
|
||||||
+ int tz_minuteswest; /* minutes W of Greenwich */
|
|
||||||
+ int tz_dsttime; /* type of dst correction */
|
|
||||||
+ } tz;
|
|
||||||
|
|
||||||
gettimeofday (&tv, &tz);
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
@ -1,9 +0,0 @@
|
|||||||
config BR2_PACKAGE_MICROWIN
|
|
||||||
bool "microwin"
|
|
||||||
# Old, unmaintained graphics stack
|
|
||||||
depends on BR2_DEPRECATED
|
|
||||||
help
|
|
||||||
Microwindows Graphical User Interface for small and
|
|
||||||
embedded enviroments.
|
|
||||||
|
|
||||||
http://microwindows.censoft.com/
|
|
@ -1,61 +0,0 @@
|
|||||||
#############################################################
|
|
||||||
#
|
|
||||||
# Microwindows - 2003/11/17 Greg Haerr
|
|
||||||
# (requires CVS 2003/11/17 or later)
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
MICROWIN_SITE:=ftp://ftp.microwindows.org/pub/microwindows
|
|
||||||
MICROWIN_SOURCE:=microwindows-src-snapshot.tar.gz
|
|
||||||
MICROWIN_DIR:=$(BUILD_DIR)/microwin
|
|
||||||
#MICROWIN_SOURCE:=microwindows-0.91.tar.gz
|
|
||||||
#MICROWIN_DIR:=$(BUILD_DIR)/microwindows-0.91
|
|
||||||
|
|
||||||
MICROWIN_CAT:=$(ZCAT)
|
|
||||||
MICROWIN_BINARY:=$(MICROWIN_DIR)/src/bin/nano-X
|
|
||||||
MICROWIN_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/nano-X
|
|
||||||
MICROWIN_VERSION=$(subst $(MICROWIN_DIR)/microwindows-,,$(wildcard $(MICROWIN_DIR)/microwindows-*))
|
|
||||||
|
|
||||||
MICROWIN_CONFIG:=$(MICROWIN_DIR)/src/Configs/config.uclibc
|
|
||||||
|
|
||||||
$(DL_DIR)/$(MICROWIN_SOURCE):
|
|
||||||
$(call DOWNLOAD,$(MICROWIN_SITE),$(MICROWIN_SOURCE))
|
|
||||||
|
|
||||||
microwin-source: $(DL_DIR)/$(MICROWIN_SOURCE)
|
|
||||||
|
|
||||||
$(MICROWIN_DIR)/.unpacked: $(DL_DIR)/$(MICROWIN_SOURCE)
|
|
||||||
[ -d $(MICROWIN_DIR) ] || mkdir $(MICROWIN_DIR)
|
|
||||||
$(MICROWIN_CAT) $(DL_DIR)/$(MICROWIN_SOURCE) | tar -C $(MICROWIN_DIR) $(TAR_OPTIONS) -
|
|
||||||
touch $(MICROWIN_DIR)/.unpacked
|
|
||||||
|
|
||||||
$(MICROWIN_DIR)/.prepared: $(MICROWIN_DIR)/.unpacked
|
|
||||||
mv $(MICROWIN_DIR)/microwindows-$(MICROWIN_VERSION)/* $(MICROWIN_DIR)
|
|
||||||
toolchain/patch-kernel.sh $(MICROWIN_DIR) package/microwin/ microwindows-$(MICROWIN_VERSION)\*.patch
|
|
||||||
touch $(MICROWIN_DIR)/.prepared
|
|
||||||
|
|
||||||
$(MICROWIN_DIR)/.configured: $(MICROWIN_DIR)/.prepared
|
|
||||||
(cd $(MICROWIN_DIR); \
|
|
||||||
)
|
|
||||||
touch $(MICROWIN_DIR)/.configured
|
|
||||||
|
|
||||||
$(MICROWIN_BINARY): $(MICROWIN_DIR)/.configured
|
|
||||||
$(MAKE) ARCH=LINUX-$(shell echo $(ARCH) | tr a-z A-Z) $(shell echo $(ARCH) | tr a-z A-Z)TOOLSPREFIX=$(TARGET_CROSS) CC="$(TARGET_CC)" -C $(MICROWIN_DIR)/src CONFIG=$(MICROWIN_CONFIG)
|
|
||||||
|
|
||||||
$(MICROWIN_TARGET_BINARY): $(MICROWIN_BINARY)
|
|
||||||
$(MAKE) INSTALL_PREFIX=$(TARGET_DIR)/usr INSTALL_OWNER1= INSTALL_OWNER2= CC="$(TARGET_CC)" -C $(MICROWIN_DIR)/src CONFIG=$(MICROWIN_CONFIG) install
|
|
||||||
|
|
||||||
microwin: $(MICROWIN_TARGET_BINARY)
|
|
||||||
|
|
||||||
microwin-clean:
|
|
||||||
-$(MAKE) -C $(MICROWIN_DIR)/src clean
|
|
||||||
|
|
||||||
microwin-dirclean:
|
|
||||||
rm -rf $(MICROWIN_DIR)
|
|
||||||
|
|
||||||
#############################################################
|
|
||||||
#
|
|
||||||
# Toplevel Makefile options
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
ifeq ($(BR2_PACKAGE_MICROWIN),y)
|
|
||||||
TARGETS+=microwin
|
|
||||||
endif
|
|
@ -1,9 +0,0 @@
|
|||||||
config BR2_PACKAGE_PCMCIA
|
|
||||||
bool "pcmcia"
|
|
||||||
depends on BR2_PACKAGE_LINUX
|
|
||||||
# The website says it's deprecated after 2.4.x kernels
|
|
||||||
depends on BR2_DEPRECATED
|
|
||||||
help
|
|
||||||
PCMCIA tools for Linux.
|
|
||||||
|
|
||||||
http://pcmcia-cs.sourceforge.net/
|
|
@ -1,114 +0,0 @@
|
|||||||
#############################################################
|
|
||||||
#
|
|
||||||
# pcmcia card services
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
# Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
|
|
||||||
# Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Library General Public License as
|
|
||||||
# published by the Free Software Foundation; either version 2 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
|
|
||||||
# Library General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Library General Public
|
|
||||||
# License along with this program; if not, write to the Free Software
|
|
||||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
||||||
# USA
|
|
||||||
|
|
||||||
PCMCIA_SOURCE:=pcmcia-cs-3.2.7.tar.gz
|
|
||||||
PCMCIA_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/pcmcia-cs
|
|
||||||
PCMCIA_DIR:=$(BUILD_DIR)/pcmcia-cs-3.2.7
|
|
||||||
PCMCIA_CAT:=$(ZCAT)
|
|
||||||
|
|
||||||
$(DL_DIR)/$(PCMCIA_SOURCE):
|
|
||||||
$(call DOWNLOAD,$(PCMCIA_SITE),$(PCMCIA_SOURCE))
|
|
||||||
|
|
||||||
pcmcia-source: $(DL_DIR)/$(PCMCIA_SOURCE)
|
|
||||||
|
|
||||||
$(PCMCIA_DIR)/.unpacked: $(DL_DIR)/$(PCMCIA_SOURCE)
|
|
||||||
$(PCMCIA_CAT) $(DL_DIR)/$(PCMCIA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
|
|
||||||
touch $(PCMCIA_DIR)/.unpacked
|
|
||||||
|
|
||||||
$(PCMCIA_DIR)/.patched: $(PCMCIA_DIR)/.unpacked
|
|
||||||
toolchain/patch-kernel.sh $(PCMCIA_DIR) package/pcmcia/ pcmcia\*.patch
|
|
||||||
touch $(PCMCIA_DIR)/.patched
|
|
||||||
|
|
||||||
$(PCMCIA_DIR)/.configured: $(PCMCIA_DIR)/.patched
|
|
||||||
( cd $(PCMCIA_DIR); ./Configure --kernel=$(LINUX26_DIR) --noprompt \
|
|
||||||
--rcdir=/etc --arch=$(ARCH) --trust --srctree --nocardbus \
|
|
||||||
--sysv --kcc=$(TARGET_CROSS)gcc --ucc="$(TARGET_CC)" --ld=$(TARGET_CROSS)ld \
|
|
||||||
--target=$(TARGET_DIR))
|
|
||||||
$(SED) "s/pump/udhcpc/" $(PCMCIA_DIR)/etc/network
|
|
||||||
$(SED) "s/ide_cs/ide-cs/" $(PCMCIA_DIR)/etc/config
|
|
||||||
$(SED) "s/bind \"wvlan_cs\"/bind \"orinoco_cs\"/g" $(PCMCIA_DIR)/etc/config
|
|
||||||
touch $(PCMCIA_DIR)/.configured
|
|
||||||
|
|
||||||
$(PCMCIA_DIR)/cardmgr/cardmgr: $(PCMCIA_DIR)/.configured
|
|
||||||
$(MAKE) -C $(PCMCIA_DIR) -i all
|
|
||||||
-A=`find $(PCMCIA_DIR) -type f -perm +111`; \
|
|
||||||
for fo in $$A; do \
|
|
||||||
file $$fo | grep "ELF" | grep "executable" > /dev/null 2>&1; \
|
|
||||||
if [ $$? = 0 ]; then \
|
|
||||||
$(STRIPCMD) $$fo; \
|
|
||||||
fi; \
|
|
||||||
done
|
|
||||||
touch -c $(PCMCIA_DIR)/cardmgr/cardmgr
|
|
||||||
|
|
||||||
$(TARGET_DIR)/sbin/cardmgr: $(PCMCIA_DIR)/cardmgr/cardmgr
|
|
||||||
rm -rf $(TARGET_DIR)/etc/pcmcia
|
|
||||||
$(MAKE) -i -C $(PCMCIA_DIR) install
|
|
||||||
rm -rf $(TARGET_DIR)/usr/man
|
|
||||||
rm -rf $(TARGET_DIR)/usr/share/man
|
|
||||||
rm -rf $(TARGET_DIR)/usr/X11R6/man
|
|
||||||
rm -rf $(TARGET_DIR)/etc/rc.d
|
|
||||||
rm -rf $(TARGET_DIR)/etc/rc?.d
|
|
||||||
rm -f $(TARGET_DIR)/etc/init.d/pcmcia*
|
|
||||||
rm -f $(TARGET_DIR)/sbin/dump_cis $(TARGET_DIR)/sbin/pack_cis
|
|
||||||
rm -f $(TARGET_DIR)/usr/share/pnp.ids $(TARGET_DIR)/sbin/lspnp $(TARGET_DIR)/sbin/setpnp
|
|
||||||
rm -f $(TARGET_DIR)/sbin/pcinitrd
|
|
||||||
rm -f $(TARGET_DIR)/sbin/probe
|
|
||||||
rm -f $(TARGET_DIR)/sbin/ide_info
|
|
||||||
rm -f $(TARGET_DIR)/sbin/scsi_info
|
|
||||||
rm -f $(TARGET_DIR)/sbin/ftl_check
|
|
||||||
rm -f $(TARGET_DIR)/sbin/ftl_format
|
|
||||||
rm -f $(TARGET_DIR)/usr/X11R6/bin/xcardinfo
|
|
||||||
rm -rf $(TARGET_DIR)/etc/sysconfig
|
|
||||||
mkdir -p $(TARGET_DIR)/etc/default
|
|
||||||
cp -f $(PCMCIA_DIR)/etc/pcmcia $(TARGET_DIR)/etc/default/
|
|
||||||
cp -f $(PCMCIA_DIR)/etc/rc.pcmcia $(TARGET_DIR)/etc/init.d/S30pcmcia
|
|
||||||
rm -rf $(TARGET_DIR)/etc/pcmcia/cis
|
|
||||||
chmod a+x $(TARGET_DIR)/etc/init.d/S30pcmcia
|
|
||||||
chmod -R u+w $(TARGET_DIR)/etc/pcmcia/*
|
|
||||||
|
|
||||||
# use busybox depmod.pl so we need the sources unpacked
|
|
||||||
$(PCMCIA_DIR)/.modules.dep: $(BUSYBOX_DIR)/.configured $(TARGET_DIR)/lib/modules
|
|
||||||
[ -d $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION) ] && \
|
|
||||||
$(BUSYBOX_DIR)/examples/depmod.pl \
|
|
||||||
-b $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/ \
|
|
||||||
-F $(LINUX26_DIR)/System.map \
|
|
||||||
> $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep
|
|
||||||
touch $(PCMCIA_DIR)/.modules.dep
|
|
||||||
|
|
||||||
pcmcia: linux26 $(TARGET_DIR)/sbin/cardmgr $(PCMCIA_DIR)/.modules.dep
|
|
||||||
|
|
||||||
pcmcia-clean:
|
|
||||||
rm -f $(TARGET_DIR)/sbin/cardmgr
|
|
||||||
-$(MAKE) -C $(PCMCIA_DIR) clean
|
|
||||||
rm -f $(PCMCIA_DIR)/.configured $(PCMCIA_DIR)/config.out
|
|
||||||
|
|
||||||
pcmcia-dirclean:
|
|
||||||
rm -rf $(PCMCIA_DIR)
|
|
||||||
#############################################################
|
|
||||||
#
|
|
||||||
# Toplevel Makefile options
|
|
||||||
#
|
|
||||||
#############################################################
|
|
||||||
ifeq ($(BR2_PACKAGE_PCMCIA),y)
|
|
||||||
TARGETS+=pcmcia
|
|
||||||
endif
|
|
@ -1,123 +0,0 @@
|
|||||||
--- pcmcia-cs-3.1.34/etc/config.opts.orig Tue Jul 9 09:36:23 2002
|
|
||||||
+++ pcmcia-cs-3.1.34/etc/config.opts Tue Jul 9 09:37:47 2002
|
|
||||||
@@ -5,7 +5,7 @@
|
|
||||||
|
|
||||||
# System resources available for PCMCIA devices
|
|
||||||
|
|
||||||
-include port 0x100-0x4ff, port 0x800-0x8ff, port 0xc00-0xcff
|
|
||||||
+include port 0x100-0x4ff, port 0xc00-0xcff
|
|
||||||
include memory 0xc0000-0xfffff
|
|
||||||
include memory 0xa0000000-0xa0ffffff, memory 0x60000000-0x60ffffff
|
|
||||||
|
|
||||||
diff -urN pcmcia-cs-3.2.3.orig/etc/shared pcmcia-cs-3.2.3/etc/shared
|
|
||||||
--- pcmcia-cs-3.2.3.orig/etc/shared 2002-08-18 21:21:11.000000000 -0600
|
|
||||||
+++ pcmcia-cs-3.2.3/etc/shared 2003-02-14 05:05:07.000000000 -0700
|
|
||||||
@@ -2,6 +2,8 @@
|
|
||||||
# shared 1.31 2002/08/19 03:21:11 (David Hinds)
|
|
||||||
#
|
|
||||||
|
|
||||||
+umask 022
|
|
||||||
+
|
|
||||||
usage ()
|
|
||||||
{
|
|
||||||
echo "usage: $0 [action] [device name]"
|
|
||||||
--- /dev/null 2003-01-21 22:14:35.000000000 -0700
|
|
||||||
+++ pcmcia-cs-3.2.4/etc/pcmcia 2003-06-09 12:04:02.000000000 -0600
|
|
||||||
@@ -0,0 +1,6 @@
|
|
||||||
+# Defaults for pcmcia (sourced by /etc/init.d/S30pcmcia)
|
|
||||||
+PCMCIA=yes
|
|
||||||
+PCIC=yenta_socket
|
|
||||||
+PCIC_OPTS=
|
|
||||||
+CORE_OPTS=
|
|
||||||
+CARDMGR_OPTS=
|
|
||||||
--- pcmcia-cs-3.2.4/etc/rc.pcmcia.orig 2002-08-08 00:43:43.000000000 -0600
|
|
||||||
+++ pcmcia-cs-3.2.4/etc/rc.pcmcia 2003-06-09 15:17:28.000000000 -0600
|
|
||||||
@@ -4,6 +4,8 @@
|
|
||||||
#
|
|
||||||
# This is designed to work in BSD as well as SysV init setups. See
|
|
||||||
# the HOWTO for customization instructions.
|
|
||||||
+# Modified to comply with Debian's standards by Brian Mays
|
|
||||||
+# <brian@debian.org>.
|
|
||||||
|
|
||||||
# Tags for Red Hat init configuration tools
|
|
||||||
#
|
|
||||||
@@ -26,9 +28,9 @@
|
|
||||||
done
|
|
||||||
|
|
||||||
# Source PCMCIA configuration, if available
|
|
||||||
-if [ -f /etc/pcmcia.conf ] ; then
|
|
||||||
+if [ -f /etc/default/pcmcia ] ; then
|
|
||||||
# Debian startup option file
|
|
||||||
- . /etc/pcmcia.conf
|
|
||||||
+ . /etc/default/pcmcia
|
|
||||||
elif [ -f /etc/sysconfig/pcmcia ] ; then
|
|
||||||
# Red Hat startup option file
|
|
||||||
. /etc/sysconfig/pcmcia
|
|
||||||
@@ -50,9 +52,22 @@
|
|
||||||
done
|
|
||||||
if [ "$PCMCIA" -a "$PCMCIA" != "yes" ] ; then exit 0 ; fi
|
|
||||||
|
|
||||||
+# Debian modification: Fix PCIC for stand-alone modules.
|
|
||||||
+# yenta_socket -> i82365 on these systems.
|
|
||||||
+# Existence of a standalone module implies that it is preferred.
|
|
||||||
+if [ -d /lib/modules/preferred ] ; then
|
|
||||||
+ PC=/lib/modules/preferred/pcmcia
|
|
||||||
+else
|
|
||||||
+ PC=/lib/modules/`uname -r`/pcmcia
|
|
||||||
+fi
|
|
||||||
+if [ "$PCIC" = yenta_socket -a -e $PC/i82365.o \
|
|
||||||
+ -a ! -L $PC/i82365.o ]; then
|
|
||||||
+ PCIC=i82365
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
usage()
|
|
||||||
{
|
|
||||||
- echo "Usage: $0 {start|stop|status|restart|reload}"
|
|
||||||
+ echo "Usage: $0 {start|stop|status|restart|reload|force-reload}"
|
|
||||||
}
|
|
||||||
|
|
||||||
cleanup()
|
|
||||||
@@ -84,7 +99,7 @@
|
|
||||||
SC=/var/lib/pcmcia/scheme
|
|
||||||
RUN=/var/lib/pcmcia
|
|
||||||
else
|
|
||||||
- SC=/var/run/pcmcia-scheme
|
|
||||||
+ SC=/var/lib/misc/pcmcia-scheme
|
|
||||||
RUN=/var/run
|
|
||||||
fi
|
|
||||||
if [ -L $SC -o ! -O $SC ] ; then rm -f $SC ; fi
|
|
||||||
@@ -154,7 +172,7 @@
|
|
||||||
;;
|
|
||||||
|
|
||||||
status)
|
|
||||||
- pid=`/sbin/pidof cardmgr`
|
|
||||||
+ pid=`/bin/pidof cardmgr`
|
|
||||||
if [ "$pid" != "" ] ; then
|
|
||||||
echo "cardmgr (pid $pid) is running..."
|
|
||||||
EXITCODE=0
|
|
||||||
@@ -164,12 +182,18 @@
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
- restart|reload)
|
|
||||||
+ restart)
|
|
||||||
$0 stop
|
|
||||||
$0 start
|
|
||||||
EXITCODE=$?
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ reload|force-reload)
|
|
||||||
+ echo "Reloading $DESC configuration files."
|
|
||||||
+ kill -1 `cat /var/run/cardmgr.pid` 2>/dev/null
|
|
||||||
+ EXITCODE=0
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
*)
|
|
||||||
usage
|
|
||||||
;;
|
|
||||||
@@ -179,4 +203,4 @@
|
|
||||||
done
|
|
||||||
|
|
||||||
# Only exit if we're in our own subshell
|
|
||||||
-case $0 in *rc.pcmcia) exit $EXITCODE ;; esac
|
|
||||||
+case $0 in *pcmcia) exit $EXITCODE ;; esac
|
|
Loading…
x
Reference in New Issue
Block a user